linux-stable/arch/powerpc/platforms/86xx
Linus Torvalds 1197ab2942 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
  powerpc/p3060qds: Add support for P3060QDS board
  powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
  powerpc/85xx: Make kexec to interate over online cpus
  powerpc/fsl_booke: Fix comment in head_fsl_booke.S
  powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
  powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
  powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
  powerpc/86xx: Correct Gianfar support for GE boards
  powerpc/cpm: Clear muram before it is in use.
  drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
  powerpc/fsl_msi: add support for "msi-address-64" property
  powerpc/85xx: Setup secondary cores PIR with hard SMP id
  powerpc/fsl-booke: Fix settlbcam for 64-bit
  powerpc/85xx: Adding DCSR node to dtsi device trees
  powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
  powerpc/85xx: fix PHYS_64BIT selection for P1022DS
  powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
  powerpc: respect mem= setting for early memory limit setup
  powerpc: Update corenet64_smp_defconfig
  powerpc: Update mpc85xx/corenet 32-bit defconfigs
  ...

Fix up trivial conflicts in:
 - arch/powerpc/configs/40x/hcu4_defconfig
	removed stale file, edited elsewhere
 - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
	added opal and gelic drivers vs added ePAPR driver
 - drivers/tty/serial/8250.c
	moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support
2011-11-06 17:12:03 -08:00
..
gef_gpio.c of/gpio: Kill of_gpio_chip and add members directly to gpio_chip 2010-07-05 16:14:30 -06:00
gef_pic.c powerpc/irq: Stop exporting irq_map 2011-05-04 15:02:15 +10:00
gef_pic.h powerpc: GE Fanuc's FPGA based PIC controller on the SBC610 2008-10-13 11:09:57 -05:00
gef_ppc9a.c powerpc/86xx: Renaming following split of GE Fanuc joint venture 2010-03-04 10:43:44 -06:00
gef_sbc310.c powerpc/86xx: Renaming following split of GE Fanuc joint venture 2010-03-04 10:43:44 -06:00
gef_sbc610.c powerpc/86xx: Renaming following split of GE Fanuc joint venture 2010-03-04 10:43:44 -06:00
Kconfig gpio: move mpc8xxx/512x gpio driver to drivers/gpio 2011-09-23 00:14:15 +02:00
Makefile powerpc/86xx: Board support for GE Fanuc's PPC9A 2009-03-19 04:01:00 -05:00
mpc86xx.h powerpc/86xx: Refactor pic init 2008-07-14 07:55:41 -05:00
mpc86xx_hpcn.c lmb: rename to memblock 2010-07-14 17:14:00 +10:00
mpc86xx_smp.c powerpc/smp: smp_ops->kick_cpu() should be able to fail 2011-04-20 17:01:18 +10:00
mpc8610_hpcd.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next 2011-08-29 09:14:30 +00:00
pic.c powerpc: Convert to new irq_* function names 2011-03-29 14:48:12 +02:00
sbc8641d.c powerpc/86xx: clean up smp init code 2009-05-19 00:50:20 -05:00