From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 May 2009 23:48:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=7b39da786a63e82d9d440075eae9018b79154d2a;p=linux-edison.git

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
---

7b39da786a63e82d9d440075eae9018b79154d2a
diff --cc include/linux/blkdev.h
index 2755d5c6da2,6f841fb1be3..b4f71f1a4af
--- a/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)))