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
..
acpi_pcihp.c
acpiphp_core.c	PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3	2007-07-11 16:02:12 -07:00
acpiphp_glue.c	PCI: hotplug: acpiphp: avoid acpiphp "cannot get bridge info" PCI hotplug failure	2007-07-11 16:02:13 -07:00
acpiphp_ibm.c	sysfs: add parameter "struct bin_attribute *" in .read/.write methods for sysfs binary attributes	2007-07-11 16:09:09 -07:00
acpiphp.h	PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3	2007-07-11 16:02:12 -07:00
cpci_hotplug_core.c	PCI: cpci_hotplug: Convert to use the kthread API	2007-07-11 16:02:11 -07:00
cpci_hotplug_pci.c	PCI: ROUND_UP macro cleanup in drivers/pci	2007-07-11 16:02:11 -07:00
cpci_hotplug.h
cpcihp_generic.c
cpcihp_zt5550.c
cpcihp_zt5550.h
cpqphp_core.c	PCI: Change all drivers to use pci_device->revision	2007-07-11 16:02:10 -07:00
cpqphp_ctrl.c
cpqphp_nvram.c
cpqphp_nvram.h
cpqphp_pci.c
cpqphp_sysfs.c
cpqphp.h
fakephp.c
ibmphp_core.c
ibmphp_ebda.c
ibmphp_hpc.c	Detach sched.h from mm.h	2007-05-21 09:18:19 -07:00
ibmphp_pci.c
ibmphp_res.c
ibmphp.h
Kconfig
Makefile
pci_hotplug_core.c
pciehp_core.c
pciehp_ctrl.c	PCI: hotplug: pciehp: wait for 1 second after power off slot	2007-07-11 16:02:12 -07:00
pciehp_hpc.c	PCI: hotplug: pciehp: Fix possible race condition in writing slot	2007-07-11 16:02:08 -07:00
pciehp_pci.c
pciehp.h	PCI: hotplug: pciehp: Fix possible race condition in writing slot	2007-07-11 16:02:08 -07:00
pcihp_skeleton.c
rpadlpar_core.c	[POWERPC] Rewrite IO allocation & mapping on powerpc64	2007-06-14 22:29:56 +10:00
rpadlpar_sysfs.c	rpadlpar breakage - fallout of struct subsystem removal	2007-05-15 18:56:37 -07:00
rpadlpar.h
rpaphp_core.c
rpaphp_pci.c
rpaphp_slot.c
rpaphp.h
sgi_hotplug.c
shpchp_core.c
shpchp_ctrl.c
shpchp_hpc.c
shpchp_pci.c
shpchp_sysfs.c
shpchp.h