From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 13 Apr 2010 18:03:21 +0000 (+0200)
Subject: Merge branch 'master' into for-2.6.35
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4facdaec1ce186e731e6baa04f074804849e9a49;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'master' into for-2.6.35

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

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

4facdaec1ce186e731e6baa04f074804849e9a49
diff --cc block/blk-cgroup.c
index 25cc7514d81,5fe03def34b..aa97cd455ce
--- a/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);