From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Dec 2008 00:54:33 +0000 (-0800)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.29-rc1~574
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3c92ec8ae91ecf59d88c798301833d7cf83f2179;p=linux-2.6-omap-h63xx.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (144 commits)
  powerpc/44x: Support 16K/64K base page sizes on 44x
  powerpc: Force memory size to be a multiple of PAGE_SIZE
  powerpc/32: Wire up the trampoline code for kdump
  powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
  powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
  powerpc/32: Setup OF properties for kdump
  powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
  powerpc: Prepare xmon_save_regs for use with kdump
  powerpc: Remove default kexec/crash_kernel ops assignments
  powerpc: Make default kexec/crash_kernel ops implicit
  powerpc: Setup OF properties for ppc32 kexec
  powerpc/pseries: Fix cpu hotplug
  powerpc: Fix KVM build on ppc440
  powerpc/cell: add QPACE as a separate Cell platform
  powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
  powerpc/mpc5200: fix error paths in PSC UART probe function
  powerpc/mpc5200: add rts/cts handling in PSC UART driver
  powerpc/mpc5200: Make PSC UART driver update serial errors counters
  powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
  powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
  ...

Fix trivial conflict in drivers/char/Makefile as per Paul's directions
---

3c92ec8ae91ecf59d88c798301833d7cf83f2179
diff --cc drivers/char/Makefile
index 36151bae0d7,52e15524af3..9caf5b5ad1c
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -50,7 -50,7 +50,8 @@@ obj-$(CONFIG_HVC_BEAT)		+= hvc_beat.
  obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o
  obj-$(CONFIG_HVC_IRQ)		+= hvc_irq.o
  obj-$(CONFIG_HVC_XEN)		+= hvc_xen.o
 +obj-$(CONFIG_HVC_IUCV)		+= hvc_iucv.o
+ obj-$(CONFIG_HVC_UDBG)		+= hvc_udbg.o
  obj-$(CONFIG_VIRTIO_CONSOLE)	+= virtio_console.o
  obj-$(CONFIG_RAW_DRIVER)	+= raw.o
  obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o