]> 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, 7 Dec 2011 02:10:17 +0000 (13:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 02:10:17 +0000 (13:10 +1100)
commit5f68224aa168853712bd7e3160e416061732da3a
tree71d0043f51cbeebb08939daa8e697421f66dce5b
parentea2757c576e49a6f277bef75908588917697b01a
parentf1f888fb2c3fb28177dafae7d79c47ee58f0c742
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
drivers/mtd/bcm63xxpart.c
arch/mips/bcm63xx/boards/board_bcm963xx.c