Merge branch 'master' into for-2.6.35
Jens Axboe [Tue, 13 Apr 2010 18:03:21 +0000 (20:03 +0200)]
Conflicts:
block/blk-cgroup.c
block/cfq-iosched.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1  2 
block/blk-cgroup.c
block/cfq-iosched.c

  #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);
Simple merge