]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit28ee7d4774dcbdcaacf403bae1be5c9fce4604e6
tree0a8edb10c05dadf99ee8158c41fe76c668238bd4
parent4f8e46bdc73d36ff9484830ce3db70be649a8331
parentaf64b37f63189cef7575fb3f8e670df767c3e15b
Merge remote-tracking branch 'l2-mtd/master'

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