git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c6f5c93 a637120)

author	Jens Axboe <axboe@kernel.dk>
	Fri, 20 Apr 2012 08:11:25 +0000 (10:11 +0200)
committer	Jens Axboe <axboe@kernel.dk>
	Fri, 20 Apr 2012 08:11:25 +0000 (10:11 +0200)
commit	87fac3d7f00d9defc8b44b8002592ef40e8b070b
tree	89a50a17d7d9a3bdfffbffb20824e2e5cd7b1eb0	tree \| snapshot
parent	c6f5c93098f5577210f8f3ea22209b3f266c66af	commit \| diff
parent	a637120e49021d197e9578cba545bbaa459cbb51	commit \| diff

Merge branch 'for-3.5/core' into for-next

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
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules