]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 01:03:21 +0000 (12:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 01:03:21 +0000 (12:03 +1100)
commit10555a7961442e5c2cb10e6301cd2ddb24f42a26
tree3b714152cc43a4058082ad00e1fd8c00c392faac
parentad5ab744f88137034e314fffe6d6f61319e4159f
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

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