Merge branch 'master' into for-2.6.35

Conflicts:
	block/blk-cgroup.c
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <[email protected]>

diff --cc block/blk-cgroup.c
index 25cc7514d817ee8e714793011107c986e4bae133,5fe03def34b24c396f299aa57bda4b1cc5a3df2a..aa97cd455cefa91400759968421ec71ed36b33af
--- 1/block/blk-cgroup.c
--- 2/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@@ -15,11 -15,8 +15,12 @@@
  #include <linux/kdev_t.h>
  #include <linux/module.h>
  #include <linux/err.h>
 +#include <linux/blkdev.h>
+ #include <linux/slab.h>
  #include "blk-cgroup.h"
 +#include <linux/genhd.h>
 +
 +#define MAX_KEY_LEN 100
  
  static DEFINE_SPINLOCK(blkio_list_lock);
  static LIST_HEAD(blkio_list);

diff --cc block/cfq-iosched.c
Simple merge