]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 01:00:53 +0000 (12:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 01:12:50 +0000 (12:12 +1100)
commit41a0865e19f8b847bb1417bd29e57d05f2dd41c1
treea931912e5fa17824ca6bd4ee603e7745ee713f72
parent963e6df0ede7f7905ac173eb8b9d8fe6c6079e10
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