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

diff --cc include/linux/blkdev.h
index 2755d5c6da2227d0987ab93713eb18a38733f390,6f841fb1be3041aae3241aa73e48667992565a56..b4f71f1a4af72bd7c68c6f6fe707f43e6a50888f
--- 1/include/linux/blkdev.h
--- 2/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -600,7 -598,7 +600,8 @@@ enum 
                                 blk_failfast_transport(rq) ||  \
                                 blk_failfast_driver(rq))
  #define blk_rq_started(rq)    ((rq)->cmd_flags & REQ_STARTED)
 +#define blk_rq_io_stat(rq)    ((rq)->cmd_flags & REQ_IO_STAT)
+ #define blk_rq_quiet(rq)      ((rq)->cmd_flags & REQ_QUIET)
  
  #define blk_account_rq(rq)    (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq)))