]> 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, 30 Oct 2012 01:42:32 +0000 (12:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 01:42:32 +0000 (12:42 +1100)
commit13f19a5c02bfbe4aeb839f1b7f8749a51d929d99
treed95e23bd9ff47bfd5718cce3d073c58c8f2ae0aa
parentdcceab553c7ce26761c87b048dfb6cfaa024ccba
parent454832b8eeb292d0efea792d4620912ab0e114ef
Merge remote-tracking branch 'block/for-next'

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