Please pull from 'merge'

[Kumar Gala]

Please pull from 'merge' branch of

	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git merge

to receive the following updates:

 arch/powerpc/configs/linkstation_defconfig       |   36 +++++++++++++--------
 arch/powerpc/configs/storcenter_defconfig        |   35 +++++++++++++--------
 arch/powerpc/platforms/embedded6xx/linkstation.c |   38 -----------------------
 arch/powerpc/platforms/embedded6xx/storcenter.c  |   32 -------------------
 4 files changed, 44 insertions(+), 97 deletions(-)

Guennadi Liakhovetski (1):
      powerpc: fix linkstation and storcenter compilation breakage