Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits)
  powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
  MAINTAINERS: Add PowerPC patterns
  powerpc/pseries: Track previous CPPR values to correctly EOI interrupts
  powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP
  powerpc: Make "intspec" pointers in irq_host->xlate() const
  powerpc/8xx: DTLB Miss cleanup
  powerpc/8xx: Remove DIRTY pte handling in DTLB Error.
  powerpc/8xx: Start using dcbX instructions in various copy routines
  powerpc/8xx: Restore _PAGE_WRITETHRU
  powerpc/8xx: Add missing Guarded setting in DTLB Error.
  powerpc/8xx: Fixup DAR from buggy dcbX instructions.
  powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions.
  powerpc/8xx: Update TLB asm so it behaves as linux mm expects.
  powerpc/8xx: Invalidate non present TLBs
  powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
  pseries/pseries: Add code to online/offline CPUs of a DLPAR node
  powerpc: stop_this_cpu: remove the cpu from the online map.
  powerpc/pseries: Add kernel based CPU DLPAR handling
  sysfs/cpu: Add probe/release files
  powerpc/pseries: Kernel DLPAR Infrastructure
  ...

1 files changed, 14 insertions, 0 deletions

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index eae1f864c934..cca8a044e2b6 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2295,6 +2295,20 @@
 #define PCI_DEVICE_ID_MPC8536           0x0051
 #define PCI_DEVICE_ID_P2020E            0x0070
 #define PCI_DEVICE_ID_P2020             0x0071
+#define PCI_DEVICE_ID_P2010E            0x0078
+#define PCI_DEVICE_ID_P2010             0x0079
+#define PCI_DEVICE_ID_P1020E            0x0100
+#define PCI_DEVICE_ID_P1020             0x0101
+#define PCI_DEVICE_ID_P1011E            0x0108
+#define PCI_DEVICE_ID_P1011             0x0109
+#define PCI_DEVICE_ID_P1022E            0x0110
+#define PCI_DEVICE_ID_P1022             0x0111
+#define PCI_DEVICE_ID_P1013E            0x0118
+#define PCI_DEVICE_ID_P1013             0x0119
+#define PCI_DEVICE_ID_P4080E            0x0400
+#define PCI_DEVICE_ID_P4080             0x0401
+#define PCI_DEVICE_ID_P4040E            0x0408
+#define PCI_DEVICE_ID_P4040             0x0409
 #define PCI_DEVICE_ID_MPC8641           0x7010
 #define PCI_DEVICE_ID_MPC8641D          0x7011
 #define PCI_DEVICE_ID_MPC8610           0x7018