Merge branch 'linus' into test

Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 30 insertions, 4 deletions

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index efb786d11f2a..bdab7c72a77f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -497,6 +497,16 @@
 #define PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP 0x1101
 #define PCI_DEVICE_ID_AMD_K8_NB_MEMCTL  0x1102
 #define PCI_DEVICE_ID_AMD_K8_NB_MISC    0x1103
+#define PCI_DEVICE_ID_AMD_10H_NB_HT     0x1200
+#define PCI_DEVICE_ID_AMD_10H_NB_MAP    0x1201
+#define PCI_DEVICE_ID_AMD_10H_NB_DRAM   0x1202
+#define PCI_DEVICE_ID_AMD_10H_NB_MISC   0x1203
+#define PCI_DEVICE_ID_AMD_10H_NB_LINK   0x1204
+#define PCI_DEVICE_ID_AMD_11H_NB_HT     0x1300
+#define PCI_DEVICE_ID_AMD_11H_NB_MAP    0x1301
+#define PCI_DEVICE_ID_AMD_11H_NB_DRAM   0x1302
+#define PCI_DEVICE_ID_AMD_11H_NB_MISC   0x1303
+#define PCI_DEVICE_ID_AMD_11H_NB_LINK   0x1304
 #define PCI_DEVICE_ID_AMD_LANCE         0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME    0x2001
 #define PCI_DEVICE_ID_AMD_SCSI          0x2020
@@ -577,6 +587,7 @@
 #define PCI_DEVICE_ID_MATROX_G200_PCI   0x0520
 #define PCI_DEVICE_ID_MATROX_G200_AGP   0x0521
 #define PCI_DEVICE_ID_MATROX_G400       0x0525
+#define PCI_DEVICE_ID_MATROX_G200EV_PCI 0x0530
 #define PCI_DEVICE_ID_MATROX_G550       0x2527
 #define PCI_DEVICE_ID_MATROX_VIA        0x4536
 
@@ -1411,6 +1422,8 @@
 #define PCI_DEVICE_ID_EICON_MAESTRAQ_U  0xe013
 #define PCI_DEVICE_ID_EICON_MAESTRAP    0xe014
 
+#define PCI_VENDOR_ID_CISCO             0x1137
+
 #define PCI_VENDOR_ID_ZIATECH           0x1138
 #define PCI_DEVICE_ID_ZIATECH_5550_HC   0x5550
  
@@ -1521,7 +1534,9 @@
 #define PCI_DEVICE_ID_MARVELL_GT64260   0x6430
 #define PCI_DEVICE_ID_MARVELL_MV64360   0x6460
 #define PCI_DEVICE_ID_MARVELL_MV64460   0x6480
-#define PCI_DEVICE_ID_MARVELL_CAFE_SD   0x4101
+#define PCI_DEVICE_ID_MARVELL_88ALP01_NAND      0x4100
+#define PCI_DEVICE_ID_MARVELL_88ALP01_SD        0x4101
+#define PCI_DEVICE_ID_MARVELL_88ALP01_CCIC      0x4102
 
 #define PCI_VENDOR_ID_V3                0x11b0
 #define PCI_DEVICE_ID_V3_V960           0x0001
@@ -2213,6 +2228,7 @@
 
 #define PCI_VENDOR_ID_ATTANSIC          0x1969
 #define PCI_DEVICE_ID_ATTANSIC_L1       0x1048
+#define PCI_DEVICE_ID_ATTANSIC_L2       0x2048
 
 #define PCI_VENDOR_ID_JMICRON           0x197B
 #define PCI_DEVICE_ID_JMICRON_JMB360    0x2360
@@ -2244,6 +2260,16 @@
 #define PCI_DEVICE_ID_3DLABS_PERMEDIA2  0x0007
 #define PCI_DEVICE_ID_3DLABS_PERMEDIA2V 0x0009
 
+#define PCI_VENDOR_ID_NETXEN            0x4040
+#define PCI_DEVICE_ID_NX2031_10GXSR     0x0001
+#define PCI_DEVICE_ID_NX2031_10GCX4     0x0002
+#define PCI_DEVICE_ID_NX2031_4GCU       0x0003
+#define PCI_DEVICE_ID_NX2031_IMEZ       0x0004
+#define PCI_DEVICE_ID_NX2031_HMEZ       0x0005
+#define PCI_DEVICE_ID_NX2031_XG_MGMT    0x0024
+#define PCI_DEVICE_ID_NX2031_XG_MGMT2   0x0025
+#define PCI_DEVICE_ID_NX3031            0x0100
+
 #define PCI_VENDOR_ID_AKS               0x416c
 #define PCI_DEVICE_ID_AKS_ALADDINCARD   0x0100
 
@@ -2429,9 +2455,9 @@
 #define PCI_DEVICE_ID_INTEL_ICH10_3     0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4     0x3a30
 #define PCI_DEVICE_ID_INTEL_ICH10_5     0x3a60
-#define PCI_DEVICE_ID_INTEL_PCH_0       0x3b10
-#define PCI_DEVICE_ID_INTEL_PCH_1       0x3b11
-#define PCI_DEVICE_ID_INTEL_PCH_2       0x3b30
+#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN 0x3b00
+#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX 0x3b1f
+#define PCI_DEVICE_ID_INTEL_PCH_SMBUS   0x3b30
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB    0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16     0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_21     0x65f5