]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Oct 2012 00:43:31 +0000 (11:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Oct 2012 00:43:31 +0000 (11:43 +1100)
commitc722559e88fa698c905c4a908a928d84d49d9bc5
treee34e56a97ddb751417b7aa54ea30a75e773b5e47
parent2407bbbbca7881fb709b5ef64166fc9b691f340e
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

Conflicts:
init/Kconfig
MAINTAINERS
block/genhd.c
drivers/block/Kconfig
drivers/block/floppy.c