Please pull from 'merge'

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:

(This is to fix a patch merge issue, the tree is based on paul's merge
tree)

 arch/powerpc/boot/dts/mpc8349emitx.dts |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Anton Vorontsov (1):
      powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts

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

Please pull from 'merge'

[Kumar Gala]

These are all either regressions or bug fixes.

- k

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/boot/dts/tqm8540.dts           |    4
 arch/powerpc/boot/dts/tqm8541.dts           |    4
 arch/powerpc/boot/dts/tqm8548-bigflash.dts  |    8 -
 arch/powerpc/boot/dts/tqm8548.dts           |    8 -
 arch/powerpc/boot/dts/tqm8555.dts           |    4
 arch/powerpc/boot/dts/tqm8560.dts           |    4
 arch/powerpc/configs/85xx/tqm8548_defconfig |  164 ++++++++--------------------
 arch/powerpc/include/asm/mmu.h              |    6 +
 arch/powerpc/include/asm/ppc-opcode.h       |   13 +-
 arch/powerpc/kernel/cputable.c              |    2
 arch/powerpc/mm/tlb_nohash_low.S            |   14 ++
 11 files changed, 95 insertions(+), 136 deletions(-)

Kumar Gala (2):
      powerpc: Fix tlbilx opcode
      powerpc: Add support for early tlbilx opcode

Wolfgang Grandegger (3):
      powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes
      powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3
      powerpc/85xx: TQM8548: update defconfig