]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:32:51 +0000 (11:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:32:51 +0000 (11:32 +1100)
commit3b90d2986930d7e9c686303c054e2bd88ade9e99
treebcc9093dc83658e77898b826599ff1bd7fd8b5ca
parent28e3fc4412dd0b7796bdddfe90b000dee1c554e7
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

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