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: b7b4292 454832b)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 4 Oct 2012 02:50:38 +0000 (12:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 4 Oct 2012 02:50:38 +0000 (12:50 +1000)
commit	7abb067d04af84a69681a8fc52a77cec8a136931
tree	35ecc7bb02293a913e6ebc67274c441faf472409	tree \| snapshot
parent	b7b4292d56dbc5612d4eb860b6effd6cca84edbb	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