linux/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 [POWERPC] Split several platforms into their respective Kconfig file 2007-03-22 10:07:32 -05:00
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 [POWERPC] Rename get_property to of_get_property: arch/powerpc 2007-04-13 03:55:19 +10:00
eeh_sysfs.c [POWERPC] Show EEH per-device false positives 2007-06-14 22:29:55 +10:00
firmware.c [POWERPC] Rename get_property to of_get_property: arch/powerpc 2007-04-13 03:55:19 +10:00
hotplug-cpu.c [POWERPC] Rename get_property to of_get_property: arch/powerpc 2007-04-13 03:55:19 +10:00
hvCall.S [POWERPC] Bypass hcall stats until cpu features have run 2007-03-22 15:01:43 +11:00
hvCall_inst.c [PATCH] mark struct file_operations const 2 2007-02-12 09:48:44 -08:00
hvconsole.c [POWERPC] clean up pseries hcall interfaces 2006-08-01 16:19:15 +10:00
hvcserver.c [PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS 2006-04-01 22:36:57 +11:00
iommu.c [POWERPC] Minor pSeries IOMMU debug cleanup 2007-05-10 21:28:13 +10:00
kexec.c [POWERPC] Fix compile error with kexec and CONFIG_SMP=n 2007-05-10 22:17:18 +10:00
lpar.c [POWERPC] Fix Kexec/Kdump for power6 2007-06-25 17:03:33 +10:00
msi.c [POWERPC] RTAS MSI implementation 2007-05-08 13:40:31 +10:00
nvram.c [POWERPC] Rename get_property to of_get_property: arch/powerpc 2007-04-13 03:55:19 +10:00
pci.c [POWERPC] Rename get_property to of_get_property: arch/powerpc 2007-04-13 03:55:19 +10:00
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 remove "struct subsystem" as it is no longer needed 2007-05-02 18:57:59 -07:00
pseries.h [POWERPC] Rewrite IO allocation & mapping on powerpc64 2007-06-14 22:29:56 +10:00
ras.c PCI: Cleanup the includes of <linux/pci.h> 2007-05-02 19:02:35 -07:00
reconfig.c [POWERPC] Generalise device_node flag interface 2007-07-10 21:53:46 +10:00
rtasd.c [POWERPC] Rename get_property to of_get_property: arch/powerpc 2007-04-13 03:55:19 +10:00
scanlog.c [PATCH] mark struct file_operations const 2 2007-02-12 09:48:44 -08:00
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 [POWERPC] Cleanup pseries smp initialisation code 2007-02-14 11:50:03 +11:00
xics.c [POWERPC] Fix interrupt distribution in ppc970 2007-06-25 17:03:31 +10:00
xics.h IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00