]> 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, 17 Oct 2012 00:16:37 +0000 (11:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Oct 2012 00:16:37 +0000 (11:16 +1100)
commit983e935e75b05fffe1dcf4f9965e9e7ca80b7839
tree83635bcbb05344d38a0095aee6547d4af31e7366
parente555246db06c1a9579a6021655fdc7002d059e70
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

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