]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 01:07:50 +0000 (12:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 01:07:50 +0000 (12:07 +1100)
commit241fe880c3bbbacb6464f6afcfd763de571112c3
tree756028b28090205988e4e89d25bb912cb923570e
parent2d8f0bf8955214fe801d17d89e66a0c86963d35a
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

Conflicts:
init/Kconfig
MAINTAINERS
block/blk-core.c
block/genhd.c
block/ioctl.c
drivers/block/Kconfig
drivers/block/floppy.c
drivers/md/dm.c
drivers/md/md.c
drivers/target/target_core_iblock.c
include/linux/fs.h
lib/scatterlist.c