]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v3.4-rc5' into for-3.5/core
authorJens Axboe <axboe@kernel.dk>
Tue, 1 May 2012 12:29:55 +0000 (14:29 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 1 May 2012 12:29:55 +0000 (14:29 +0200)
commit563f0f67c91d5913ef814ae36625c2316dfadf8e
treeade6d4e411b9b9b569c802e3b2179826162c934c
parentce88ceb3db6a824db7082a6f3bc57d53aaecbcc3
parentda784a22d14b058c5764405c2bcf72806d256141
Merge tag 'v3.4-rc5' into for-3.5/core

The core branch is behind driver commits that we want to build
on for 3.5, hence I'm pulling in a later -rc.

Linux 3.4-rc5

Conflicts:
Documentation/feature-removal-schedule.txt

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Documentation/feature-removal-schedule.txt
block/blk-core.c
block/blk-throttle.c
block/cfq-iosched.c
fs/splice.c
include/linux/blkdev.h
init/Kconfig
kernel/cpuset.c
kernel/sched/core.c
mm/memcontrol.c