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

Manual merge for trivial #include changes

diff --cc block/ll_rw_blk.c
index c44d6fe,8e13645..8e27d0a
--- 1/block/ll_rw_blk.c
--- 2/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

diff --cc include/linux/blkdev.h
Simple merge