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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f23ef47 454832b)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 03:31:41 +0000 (13:31 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 03:31:41 +0000 (13:31 +1000)
commit	c795ce50a6b12aa8b09813295090cd197c95a567
tree	7ba5945da77da7bad9a8f455f15bfaa2a14dac91	tree \| snapshot
parent	f23ef478225e830e5cd2d66bf27bb3187c7b68d2	commit \| diff
parent	454832b8eeb292d0efea792d4620912ab0e114ef	commit \| diff

Merge remote-tracking branch 'block/for-next'

Conflicts:
init/Kconfig

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
block/blk-core.c	diff1 \|	diff2 \|	blob \| history
block/genhd.c	diff1 \|	diff2 \|	blob \| history
block/ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/block/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/block/floppy.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_iblock.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules