]> 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, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)
commit22f8499aa0ce415a68b58762728fd0542e6d38f7
treea9f5ba3b3bdb45927a30227494de66685354f8a7
parent36f23ea8026ea489dd2b6aef2cc91fc558dc4ff3
parenta4699233f927738db633687a2276a9f3e127d799
Merge remote-tracking branch 'l2-mtd/master'

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