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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
  [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
  [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
  [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
  [POWERPC] Oprofile support for Power 5++
  [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
  [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
  [POWERPC] Remove dead code for preventing pread() and pwrite() calls
  [POWERPC] Remove unnecessary #undef printk from prom.c
  [POWERPC] Fix typo in Ebony default DTS
  [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
  [POWERPC] Remove extra return statement
  [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
  [POWERPC] pasemi: Rename platform
  [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
  [POWERPC] Add __read_mostly support for powerpc
  [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
  [POWERPC] Create a dummy zImage if no valid platform has been selected
  [POWERPC] PS3: Bootwrapper support.
  [POWERPC] powermac i2c: Use mutex
  [POWERPC] Schedule removal of arch/ppc
  ...

Fixed up conflicts manually in:

	Documentation/feature-removal-schedule.txt
	arch/powerpc/kernel/pci_32.c
	arch/powerpc/kernel/pci_64.c
	include/asm-powerpc/pci.h

and asked the powerpc people to double-check the result..

diff --cc Documentation/feature-removal-schedule.txt
index 18bd2ddccb156aef5175533e084625a50e8827eb,55b5d6a210d89a9ffb5a107a85984f92d573dd5d..d05e6243b4df2b0bc0db3d58e1105644a91ba48d
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -282,18 -330,15 +282,31 @@@ Who:  Tejun Heo <htejun@gmail.com
  
  ---------------------------
  
 +What: Legacy RTC drivers (under drivers/i2c/chips)
 +When: November 2007
 +Why:  Obsolete. We have a RTC subsystem with better drivers.
 +Who:  Jean Delvare <khali@linux-fr.org>
 +
 +---------------------------
 +
 +What: iptables SAME target
 +When: 1.1. 2008
 +Files:        net/ipv4/netfilter/ipt_SAME.c, include/linux/netfilter_ipv4/ipt_SAME.h
 +Why:  Obsolete for multiple years now, NAT core provides the same behaviour.
 +      Unfixable broken wrt. 32/64 bit cleanness.
 +Who:  Patrick McHardy <kaber@trash.net>
 +
 +---------------------------
++
+ What: The arch/ppc and include/asm-ppc directories
+ When: Jun 2008
+ Why:  The arch/powerpc tree is the merged architecture for ppc32 and ppc64
+       platforms.  Currently there are efforts underway to port the remaining
+       arch/ppc platforms to the merged tree.  New submissions to the arch/ppc
+       tree have been frozen with the 2.6.22 kernel release and that tree will
+       remain in bug-fix only mode until its scheduled removal.  Platforms
+       that are not ported by June 2008 will be removed due to the lack of an
+       interested maintainer.
+ Who:  linuxppc-dev@ozlabs.org
+ 
+ ---------------------------

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/pci_64.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/setup.c
Simple merge

diff --cc include/asm-powerpc/pci.h
index e16e7bc9ab5cf2640364ea19586319edbc080025,0cd3e77efd20498fec8e2b831a030cc529a731f4..7b11765c6865f31157dd30c6ee91ba5c1ecc9ad0
--- 1/include/asm-powerpc/pci.h
--- 2/include/asm-powerpc/pci.h
+++ b/include/asm-powerpc/pci.h
@@@ -112,9 -122,12 +110,6 @@@ static inline void pci_dma_burst_advice
  }
  #endif
  
- /* Return the index of the PCI controller for device PDEV. */
- #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
 -/*
 - * At present there are very few 32-bit PPC machines that can have
 - * memory above the 4GB point, and we don't support that.
 - */
 -#define pci_dac_dma_supported(pci_dev, mask)  (0)
--
  /* Set the name of the bus as it appears in /proc/bus/pci */
  static inline int pci_proc_domain(struct pci_bus *bus)
  {

diff --cc include/asm-powerpc/pgtable-ppc32.h
Simple merge

diff --cc include/asm-powerpc/pgtable-ppc64.h
Simple merge