Merge remote-tracking branch 'l2-mtd/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)
diff --cc arch/mips/bcm63xx/boards/board_bcm963xx.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Dec 2011 02:29:15 +0000 (13:29 +1100)