diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
| commit | 4facdaec1ce186e731e6baa04f074804849e9a49 (patch) | |
| tree | e521fba8386bf23533cfe21ea5200e615960ec07 /block/blk-cgroup.c | |
| parent | a11cdaa7af56423a921a8bdad8f5a5f4ddca918a (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
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>
Diffstat (limited to 'block/blk-cgroup.c')
| -rw-r--r-- | block/blk-cgroup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 25cc7514d817..aa97cd455cef 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 18 | #include <linux/blkdev.h> | 18 | #include <linux/blkdev.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include "blk-cgroup.h" | 20 | #include "blk-cgroup.h" |
| 20 | #include <linux/genhd.h> | 21 | #include <linux/genhd.h> |
| 21 | 22 | ||