]> 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, 2 Nov 2012 02:15:44 +0000 (13:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Nov 2012 02:15:44 +0000 (13:15 +1100)
commit74ede2383b12555f46470870845daa5c14f1f113
tree36f9ac215cebb17e56191286359454ace54a0994
parentcef4bd1c83503cf8f8091c8cea9f0443902b796c
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

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