]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 03:45:01 +0000 (14:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 03:45:01 +0000 (14:45 +1100)
commita7de8e039248cc58efb110b280cf313c2d447ebe
tree99be220b71f33e89b1b447d23fcc3bc5207b8b22
parent426103fa7f68bbae73c4a7431131d9a00f775a33
parenta4699233f927738db633687a2276a9f3e127d799
Merge remote-tracking branch 'l2-mtd/master'

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