uthor Linus Torvalds <torvalds@linux-foundation.org> 1241308112 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241308112 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
`�0x