Merge branch 'master' into for-2.6.35
authorJens Axboe <jens.axboe@oracle.com>
Tue, 13 Apr 2010 18:03:21 +0000 (20:03 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 13 Apr 2010 18:03:21 +0000 (20:03 +0200)
commit4facdaec1ce186e731e6baa04f074804849e9a49
treee521fba8386bf23533cfe21ea5200e615960ec07
parenta11cdaa7af56423a921a8bdad8f5a5f4ddca918a
parent0d0fb0f9c5fddef4a10242fe3337f00f528a3099
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>
block/blk-cgroup.c
block/cfq-iosched.c