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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 8 Oct 2012 00:56:06 +0000 (11:56 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 8 Oct 2012 00:56:06 +0000 (11:56 +1100)
commit	792d5c573c4406290b888513165ec9e4f62f414e
tree	804eb526e2031f1cea50741ccaebbe3188ae99e0	tree \| snapshot
parent	1febd8afd6c40e319ff15d4d8016f9567a033741	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
lib/scatterlist.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules