]> 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, 24 Oct 2012 01:09:45 +0000 (12:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 01:09:45 +0000 (12:09 +1100)
commita6aa3380dd808bc16ff4a638c56b8ae0e8a042ea
tree0066d13e7995109ed8a4385bbdeea61daabd61de
parent502913217db522bdcf5463ea3a41a0b673cceb70
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

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