Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
commit7b39da786a63e82d9d440075eae9018b79154d2a
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:48:32 +0000 (2 16:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:48:32 +0000 (2 16:48 -0700)
treee0c415aa911136293d50e0116bafdc5128bd4080
parent2142babac999a5ba169348892a8e3ac222bec7a4
parent96c16743973e8c1a7b9c655d10b7973408d6d1dd
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