Merge remote-tracking branch 'galak/next'

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

Wed, 20 Feb 2013 00:26:52 +0000 (11:26 +1100)

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

Wed, 20 Feb 2013 00:26:52 +0000 (11:26 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 00:26:52 +0000 (11:26 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 00:26:52 +0000 (11:26 +1100)
diff --cc arch/powerpc/platforms/512x/mpc512x_shared.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 00:26:52 +0000 (11:26 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 00:26:52 +0000 (11:26 +1100)