]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:24:20 +0000 (13:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:24:20 +0000 (13:24 +1100)
commit5a0e766046d013862648536c5f85eeb5a98e688b
treebef251a59bf8e04cbf5971e31fb615c3a728ca01
parent5f6c9e0b5a2ed34d65a7f47d237107338e8b14ca
parentf03fdc2fa1427f8e553a526cfff8a04f8ce15d60
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
drivers/mtd/maps/bcm963xx-flash.c
arch/mips/bcm63xx/boards/board_bcm963xx.c