From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 9 Jan 2006 17:26:40 +0000 (-0800)
Subject: Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.16-rc1~672
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e2688f00dc0ceb9d9867434dffbd080411fc23b0;p=linux-2.6-omap-h63xx.git

Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual merge for trivial #include changes
---

e2688f00dc0ceb9d9867434dffbd080411fc23b0
diff --cc block/ll_rw_blk.c
index c44d6fe9f6c,8e136450abc..8e27d0ab0d7
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@@ -26,6 -26,9 +26,8 @@@
  #include <linux/slab.h>
  #include <linux/swap.h>
  #include <linux/writeback.h>
 -#include <linux/blkdev.h>
+ #include <linux/interrupt.h>
+ #include <linux/cpu.h>
  
  /*
   * for max sense size