Please pull from 'next' branch (for 2.6.30)

Please pull from 'next' branch (for 2.6.30)

[Kumar Gala]

Please pull from 'next' branch of

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

to receive the following updates:

 Documentation/powerpc/dts-bindings/fsl/dma.txt |   34
 arch/powerpc/Kconfig                           |   19
 arch/powerpc/boot/dts/gef_sbc310.dts           |  364 +++++
 arch/powerpc/boot/dts/mpc8315erdb.dts          |   64
 arch/powerpc/boot/dts/mpc8377_mds.dts          |   64
 arch/powerpc/boot/dts/mpc8377_rdb.dts          |   70 +
 arch/powerpc/boot/dts/mpc8378_mds.dts          |   64
 arch/powerpc/boot/dts/mpc8378_rdb.dts          |   70 +
 arch/powerpc/boot/dts/mpc8379_rdb.dts          |    6
 arch/powerpc/configs/86xx/gef_sbc310_defconfig | 1613 +++++++++++++++++++++++++
 arch/powerpc/include/asm/reg_booke.h           |    1
 arch/powerpc/kernel/Makefile                   |    1
 arch/powerpc/kernel/cpu_setup_fsl_booke.S      |   31
 arch/powerpc/kernel/cputable.c                 |    8
 arch/powerpc/kernel/head_booke.h               |    6
 arch/powerpc/kernel/head_fsl_booke.S           |   81 -
 arch/powerpc/mm/fsl_booke_mmu.c                |   93 -
 arch/powerpc/platforms/83xx/mpc831x_rdb.c      |    2
 arch/powerpc/platforms/83xx/mpc837x_mds.c      |   10
 arch/powerpc/platforms/83xx/mpc837x_rdb.c      |    2
 arch/powerpc/platforms/86xx/Kconfig            |   10
 arch/powerpc/platforms/86xx/Makefile           |    1
 arch/powerpc/platforms/86xx/gef_gpio.c         |   36
 arch/powerpc/platforms/86xx/gef_sbc310.c       |  230 +++
 arch/powerpc/sysdev/cpm2.c                     |    3
 arch/powerpc/sysdev/fsl_pci.c                  |  244 +++
 drivers/watchdog/Kconfig                       |    2
 include/linux/pci_ids.h                        |    8
 28 files changed, 3003 insertions(+), 134 deletions(-)

Anton Vorontsov (2):
      powerpc/fsl_pci: Add MPC83xx PCI-E controller RC mode support
      powerpc/83xx: Add PCI-E support for all MPC83xx boards with PCI-E

Kumar Gala (2):
      powerpc/fsl-booke: Cleanup init/exception setup to be runtime
      powerpc/fsl: Ensure PCI_QUIRKS are enabled for FSL_PCI

Laurent Pinchart (1):
      cpm2: Round the baud-rate clock divider to the nearest integer.

Martyn Welch (3):
      powerpc/86xx: Board support for GE Fanuc SBC310
      powerpc/86xx: Default configutation for GE Fanuc's SBC310
      powerpc/86xx: Extend GE Fanuc GPIO driver for the SBC310

Peter Korsgaard (1):
      powerpc: convert dts-bindings/fsl/dma.txt to dts-v1 syntax

Reynes Philippe (1):
      powerpc/83xx: Add i2c eeprom to dts for MPC837x RDB

Trent Piepho (3):
      powerpc/fsl-booke: Remove code duplication in lowmem mapping
      powerpc/fsl-booke: Allow larger CAM sizes than 256 MB
      powerpc/fsl-booke: Make CAM entries used for lowmem configurable

Please pull from 'next' branch (for 2.6.30)

[Kumar Gala]

Please pull from 'next' branch of

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

to receive the following updates:

 arch/powerpc/Kconfig                   |    1 +
 arch/powerpc/boot/dts/ksi8560.dts      |    4 ++--
 arch/powerpc/boot/dts/sbc8548.dts      |    4 ++--
 arch/powerpc/boot/dts/sbc8560.dts      |    4 ++--
 arch/powerpc/boot/dts/stx_gp3_8560.dts |    4 ++--
 arch/powerpc/boot/dts/tqm8540.dts      |    4 ++--
 arch/powerpc/boot/dts/tqm8541.dts      |    4 ++--
 arch/powerpc/boot/dts/tqm8555.dts      |    4 ++--
 arch/powerpc/boot/dts/tqm8560.dts      |    4 ++--
 include/linux/fsl_devices.h            |   22 ----------------------
 10 files changed, 17 insertions(+), 38 deletions(-)

Grant Likely (1):
      powerpc: Remove unused symbols from fsl_devices.h

Josh Boyer (1):
      powerpc: Make LOWMEM_CAM_NUM depend on FSL_BOOKE

Kumar Gala (1):
      powerpc/85xx: Use fsl,mpc85.. as prefix for memory ctrl & l2-cache nodes

Please pull from 'next' branch (for 2.6.30)

[Kumar Gala]

Please pull from 'next' branch of

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

to receive the following updates:

 arch/powerpc/Kconfig                    |    1
 arch/powerpc/boot/dts/ksi8560.dts       |    4 +--
 arch/powerpc/boot/dts/pq2fads.dts       |   20 +++++++++++++-----
 arch/powerpc/boot/dts/sbc8548.dts       |    4 +--
 arch/powerpc/boot/dts/sbc8560.dts       |    4 +--
 arch/powerpc/boot/dts/socrates.dts      |    1
 arch/powerpc/boot/dts/stx_gp3_8560.dts  |    4 +--
 arch/powerpc/boot/dts/tqm8540.dts       |    4 +--
 arch/powerpc/boot/dts/tqm8541.dts       |    4 +--
 arch/powerpc/boot/dts/tqm8555.dts       |    4 +--
 arch/powerpc/boot/dts/tqm8560.dts       |    4 +--
 arch/powerpc/include/asm/mpic.h         |   12 +++++++++++
 arch/powerpc/include/asm/reg.h          |   30 ++++++++++++++++++++++++++++
 arch/powerpc/include/asm/reg_booke.h    |   30 ----------------------------
 arch/powerpc/include/asm/sfp-machine.h  |    6 ++---
 arch/powerpc/sysdev/mpic.c              |   34 ++++++++++++++++++++++++++++++++
 drivers/serial/cpm_uart/cpm_uart_core.c |   14 ++++++-------
 drivers/video/fsl-diu-fb.c              |   34 +++++++++++++++++++-------------
 include/linux/fsl_devices.h             |   22 --------------------
 19 files changed, 139 insertions(+), 97 deletions(-)

Anton Vorontsov (1):
      fsl-diu-fb: Pass the proper device for dma mapping routines

Grant Likely (1):
      powerpc: Remove unused symbols from fsl_devices.h

Josh Boyer (1):
      powerpc: Make LOWMEM_CAM_NUM depend on FSL_BOOKE

Kumar Gala (4):
      powerpc/85xx: Use fsl,mpc85.. as prefix for memory ctrl & l2-cache nodes
      powerpc: Move SPEFSCR defines to common header
      powerpc/math-emu: Change types to work on ppc64
      powerpc: Add support for CoreInt delivery of interrupts on MPIC

Scott Wood (3):
      cpm_uart: Initialize port.dev before it's used.
      cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console.
      powerpc/pq2fads: Update device tree for use with device-tree-aware u-boot.

Wolfgang Grandegger (1):
      powerpc/85xx: Re-add the device_type soc to socrates.dts