projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2142bab 96c1674)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:48:32 +0000 (16:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:48:32 +0000 (16:48 -0700)
commit7b39da786a63e82d9d440075eae9018b79154d2a
treee0c415aa911136293d50e0116bafdc5128bd4080tree | snapshot
parent2142babac999a5ba169348892a8e3ac222bec7a4commit | diff
parent96c16743973e8c1a7b9c655d10b7973408d6d1ddcommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/bart/ide-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-cd: fix REQ_QUIET tests in cdrom_decode_status

Fix up trivial conflicts in include/linux/blkdev.h
include/linux/blkdev.h diff1 | diff2 | blob | history
Making Linux better for my computers