leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1ad528ebfd
linux/drivers/pci/hotplug
History
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 PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
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_generic: prevent loading without "bridge" parameter 2006-10-18 11:36:12 -07:00
cpcihp_zt5550.c PCI: ZT5550 CPCI Hotplug driver fix 2007-05-02 19:02:40 -07:00
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 PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
cpqphp_nvram.c [PATCH] getting rid of all casts of k[cmz]alloc() calls 2006-12-13 09:05:58 -08:00
cpqphp_nvram.h
cpqphp_pci.c PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
cpqphp_sysfs.c [PATCH] mark struct file_operations const 5 2007-02-12 09:48:45 -08:00
cpqphp.h PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
fakephp.c PCI: Convert to alloc_pci_dev() 2007-05-02 19:02:37 -07:00
ibmphp_core.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
ibmphp_ebda.c [PATCH] remove many unneeded #includes of sched.h 2007-02-14 08:09:54 -08:00
ibmphp_hpc.c Detach sched.h from mm.h 2007-05-21 09:18:19 -07:00
ibmphp_pci.c PCI: ibmphp_pci.c: fix NULL dereference 2006-12-01 14:37:00 -08:00
ibmphp_res.c
ibmphp.h PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
Kconfig PCI hotplug: Use menuconfig objects 2007-05-02 19:02:42 -07:00
Makefile ACPIPHP: use ACPI dock driver 2006-06-28 03:08:06 -04:00
pci_hotplug_core.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
pciehp_core.c PCI: fix multiple definition of `queue_pushbutton_work' 2007-05-02 19:02:34 -07:00
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 [PATCH] pciehp: Add missing pci_dev_put 2006-06-19 14:13:23 -07:00
pciehp.h PCI: hotplug: pciehp: Fix possible race condition in writing slot 2007-07-11 16:02:08 -07:00
pcihp_skeleton.c PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
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 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2007-05-08 11:50:19 -07:00
rpaphp_pci.c PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot() 2007-05-02 19:02:40 -07:00
rpaphp_slot.c PCI: rpaphp: remove rpaphp_set_attention_status() 2007-05-02 19:02:39 -07:00
rpaphp.h PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot() 2007-05-02 19:02:40 -07:00
sgi_hotplug.c [IA64] Fix warnings resulting from type-checking in dev_dbg() 2007-05-10 09:39:41 -07:00
shpchp_core.c PCI: fix multiple definition of `queue_pushbutton_work' 2007-05-02 19:02:34 -07:00
shpchp_ctrl.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
shpchp_hpc.c shpchp: delete trailing whitespace 2007-02-07 15:50:05 -08:00
shpchp_pci.c [PATCH] acpi_pcihp: Add support for _HPX 2006-06-19 14:13:22 -07:00
shpchp_sysfs.c SHPCHP: fix __must_check warnings 2006-09-26 17:43:53 -07:00
shpchp.h PCI: fix multiple definition of `queue_pushbutton_work' 2007-05-02 19:02:34 -07:00