]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 01:04:15 +0000 (12:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 01:04:15 +0000 (12:04 +1100)
Conflicts:
drivers/mtd/bcm63xxpart.c

1  2 
arch/mips/bcm63xx/boards/board_bcm963xx.c