linux-stable-rt/arch/powerpc/platforms/pseries
Linus Torvalds 489de30259 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..
2007-07-16 17:58:08 -07:00
..
Kconfig
Makefile [POWERPC] Add EEH sysfs blinkenlights 2007-06-14 22:29:55 +10:00
eeh.c [POWERPC] Tweak EEH copyright info 2007-06-14 22:29:56 +10:00
eeh_cache.c [POWERPC] Tweak EEH copyright info 2007-06-14 22:29:56 +10:00
eeh_driver.c [POWERPC] Tweak EEH copyright info 2007-06-14 22:29:56 +10:00
eeh_event.c
eeh_sysfs.c [POWERPC] Show EEH per-device false positives 2007-06-14 22:29:55 +10:00
firmware.c
hotplug-cpu.c
hvCall.S
hvCall_inst.c
hvconsole.c
hvcserver.c
iommu.c
kexec.c
lpar.c [POWERPC] Fix Kexec/Kdump for power6 2007-06-25 17:03:33 +10:00
msi.c
nvram.c
pci.c
pci_dlpar.c [POWERPC] Rewrite IO allocation & mapping on powerpc64 2007-06-14 22:29:56 +10:00
plpar_wrappers.h [POWERPC] Fix Kexec/Kdump for power6 2007-06-25 17:03:33 +10:00
power.c
pseries.h [POWERPC] Rewrite IO allocation & mapping on powerpc64 2007-06-14 22:29:56 +10:00
ras.c
reconfig.c [POWERPC] Generalise device_node flag interface 2007-07-10 21:53:46 +10:00
rtasd.c
scanlog.c
setup.c Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2007-07-16 17:58:08 -07:00
smp.c
xics.c [POWERPC] Fix interrupt distribution in ppc970 2007-06-25 17:03:31 +10:00
xics.h