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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 9 Oct 2012 01:07:50 +0000 (12:07 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 9 Oct 2012 01:07:50 +0000 (12:07 +1100)
commit	241fe880c3bbbacb6464f6afcfd763de571112c3
tree	756028b28090205988e4e89d25bb912cb923570e	tree \| snapshot
parent	2d8f0bf8955214fe801d17d89e66a0c86963d35a	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