1
0
Fork 0
alistair23-linux/drivers/pci/hotplug
Linus Torvalds df6d3916f3 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
  [POWERPC] Abolish powerpc_flash_init()
  [POWERPC] Early serial debug support for PPC44x
  [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
  [POWERPC] Add device tree for Ebony
  [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
  [POWERPC] MPIC U3/U4 MSI backend
  [POWERPC] MPIC MSI allocator
  [POWERPC] Enable MSI mappings for MPIC
  [POWERPC] Tell Phyp we support MSI
  [POWERPC] RTAS MSI implementation
  [POWERPC] PowerPC MSI infrastructure
  [POWERPC] Rip out the existing powerpc msi stubs
  [POWERPC] Remove use of 4level-fixup.h for ppc32
  [POWERPC] Add powerpc PCI-E reset API implementation
  [POWERPC] Holly bootwrapper
  [POWERPC] Holly DTS
  [POWERPC] Holly defconfig
  [POWERPC] Add support for 750CL Holly board
  [POWERPC] Generalize tsi108 PCI setup
  [POWERPC] Generalize tsi108 PHY types
  ...

Fixed conflict in include/asm-powerpc/kdebug.h manually

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:50:19 -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
acpi_pcihp.c PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
acpiphp.h PCI: Change memory allocation for acpiphp slots 2006-12-01 14:36:59 -08:00
acpiphp_core.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
acpiphp_glue.c header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
acpiphp_ibm.c remove "struct subsystem" as it is no longer needed 2007-05-02 18:57:59 -07:00
cpci_hotplug.h [PATCH] PCI Hotplug: CPCI update 2005-05-17 14:31:11 -07:00
cpci_hotplug_core.c PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
cpci_hotplug_pci.c PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
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 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cpqphp.h PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
cpqphp_core.c PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -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 Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
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
fakephp.c PCI: Convert to alloc_pci_dev() 2007-05-02 19:02:37 -07:00
ibmphp.h PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -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 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
ibmphp_pci.c PCI: ibmphp_pci.c: fix NULL dereference 2006-12-01 14:37:00 -08:00
ibmphp_res.c [PATCH] ibmphp: remove TRUE and FALSE 2006-03-23 14:35:17 -08: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.h PCI: fix multiple definition of `queue_pushbutton_work' 2007-05-02 19:02:34 -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: fix multiple definition of `queue_pushbutton_work' 2007-05-02 19:02:34 -07:00
pciehp_hpc.c pciehp: Event handling rework 2007-05-02 19:02:34 -07:00
pciehp_pci.c [PATCH] pciehp: Add missing pci_dev_put 2006-06-19 14:13:23 -07:00
pcihp_skeleton.c PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
rpadlpar.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
rpadlpar_core.c PCI: rpaphp: Ensure more pcibios_add/pcibios_remove symmetry 2007-05-02 19:02:40 -07:00
rpadlpar_sysfs.c PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07:00
rpaphp.h PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot() 2007-05-02 19:02:40 -07:00
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
sgi_hotplug.c Altix: Add ACPI SSDT PCI device support (hotplug) 2007-02-02 22:14:57 -05:00
shpchp.h PCI: fix multiple definition of `queue_pushbutton_work' 2007-05-02 19:02:34 -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