]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 00:13:54 +0000 (11:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 00:13:58 +0000 (11:13 +1100)
commit0b30562299a76494d9f5b8c396fd31ad7af0ae8e
tree268c8ecaa265cc2180b7f7a58c260d044c5ca2fb
parent3416ff23d2831e0eb683e1f52059f5edf757e717
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

Conflicts:
init/Kconfig
12 files changed:
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
fs/block_dev.c
include/linux/fs.h
lib/scatterlist.c