]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)
commit3fd898dd8360c8e532738894f74d788363609f8a
tree34e7bd8062e6fde7a53a6a3b34a0b9a89c5a7e25
parentb3207d8fdb4f36911d83915a74c329b20cb38f17
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

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