projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bd1a68b 69964ea)
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)
commit0b7877d4eea3f93e3dd941999522bbd8c538cb53
treeade6d4e411b9b9b569c802e3b2179826162c934ctree | snapshot
parentbd1a68b59c8e3bce45fb76632c64e1e063c3962dcommit | diff
parent69964ea4c7b68c9399f7977aa5b9aa6539a6a98acommit | diff
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 diff1 | diff2 | blob | history
block/blk-core.c diff1 | diff2 | blob | history
block/blk-throttle.c diff1 | diff2 | blob | history
block/cfq-iosched.c diff1 | diff2 | blob | history
fs/splice.c diff1 | diff2 | blob | history
include/linux/blkdev.h diff1 | diff2 | blob | history
init/Kconfig diff1 | diff2 | blob | history
kernel/cpuset.c diff1 | diff2 | blob | history
kernel/sched/core.c diff1 | diff2 | blob | history
mm/memcontrol.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;