]> 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, 31 Oct 2012 02:04:37 +0000 (13:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 02:04:37 +0000 (13:04 +1100)
commit2d168fbb3a0e3c59ee234bcbeea49eb2dd05cf39
treee3c81377c4cfe3b7608302f51a0b781325fd15f3
parentbafdc040dbaa56a0022a2687b382225f1647d903
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

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