Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

diff --combined include/linux/pci_ids.h
index eb36fd293b4191e200138c106f5c12c64b9c19f2,20fb79810c3cb2bc265bf89fe581801fd24ef656..f74ed94624755003a3e628069fcb4364cf2780e2
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -185,6 -185,7 +185,7 @@@
  #define PCI_DEVICE_ID_LSI_61C102      0x0901
  #define PCI_DEVICE_ID_LSI_63C815      0x1000
  #define PCI_DEVICE_ID_LSI_SAS1064     0x0050
+ #define PCI_DEVICE_ID_LSI_SAS1064R    0x0411
  #define PCI_DEVICE_ID_LSI_SAS1066     0x005E
  #define PCI_DEVICE_ID_LSI_SAS1068     0x0054
  #define PCI_DEVICE_ID_LSI_SAS1064A    0x005C
@@@ -392,7 -393,6 +393,7 @@@
  #define PCI_DEVICE_ID_NS_87560_USB    0x0012
  #define PCI_DEVICE_ID_NS_83815                0x0020
  #define PCI_DEVICE_ID_NS_83820                0x0022
 +#define PCI_DEVICE_ID_NS_SATURN               0x0035
  #define PCI_DEVICE_ID_NS_SCx200_BRIDGE        0x0500
  #define PCI_DEVICE_ID_NS_SCx200_SMI   0x0501
  #define PCI_DEVICE_ID_NS_SCx200_IDE   0x0502
@@@ -560,6 -560,7 +561,7 @@@
  #define PCI_VENDOR_ID_DELL            0x1028
  #define PCI_DEVICE_ID_DELL_RACIII     0x0008
  #define PCI_DEVICE_ID_DELL_RAC4               0x0012
+ #define PCI_DEVICE_ID_DELL_PERC5      0x0015
  
  #define PCI_VENDOR_ID_MATROX          0x102B
  #define PCI_DEVICE_ID_MATROX_MGA_2    0x0518
@@@ -770,8 -771,6 +772,8 @@@
  #define PCI_DEVICE_ID_TI_TVP4010      0x3d04
  #define PCI_DEVICE_ID_TI_TVP4020      0x3d07
  #define PCI_DEVICE_ID_TI_4450         0x8011
 +#define PCI_DEVICE_ID_TI_XX21_XX11    0x8031
 +#define PCI_DEVICE_ID_TI_X515         0x8036
  #define PCI_DEVICE_ID_TI_1130         0xac12
  #define PCI_DEVICE_ID_TI_1031         0xac13
  #define PCI_DEVICE_ID_TI_1131         0xac15
@@@ -788,17 -787,12 +790,17 @@@
  #define PCI_DEVICE_ID_TI_4451         0xac42
  #define PCI_DEVICE_ID_TI_4510         0xac44
  #define PCI_DEVICE_ID_TI_4520         0xac46
 +#define PCI_DEVICE_ID_TI_7510         0xac47
 +#define PCI_DEVICE_ID_TI_7610         0xac48
 +#define PCI_DEVICE_ID_TI_7410         0xac49
  #define PCI_DEVICE_ID_TI_1410         0xac50
  #define PCI_DEVICE_ID_TI_1420         0xac51
  #define PCI_DEVICE_ID_TI_1451A                0xac52
  #define PCI_DEVICE_ID_TI_1620         0xac54
  #define PCI_DEVICE_ID_TI_1520         0xac55
  #define PCI_DEVICE_ID_TI_1510         0xac56
 +#define PCI_DEVICE_ID_TI_X620         0xac8d
 +#define PCI_DEVICE_ID_TI_X420         0xac8e
  
  #define PCI_VENDOR_ID_SONY            0x104d
  #define PCI_DEVICE_ID_SONY_CXD3222    0x8039
@@@ -984,7 -978,6 +986,7 @@@
  #define PCI_DEVICE_ID_SUN_SABRE               0xa000
  #define PCI_DEVICE_ID_SUN_HUMMINGBIRD 0xa001
  #define PCI_DEVICE_ID_SUN_TOMATILLO   0xa801
 +#define PCI_DEVICE_ID_SUN_CASSINI     0xabba
  
  #define PCI_VENDOR_ID_CMD             0x1095
  #define PCI_DEVICE_ID_CMD_640         0x0640
@@@ -1277,8 -1270,7 +1279,8 @@@
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA        0x0266
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2       0x0267
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE 0x036E
 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA        0x036F
 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA        0x037E
 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2       0x037F
  #define PCI_DEVICE_ID_NVIDIA_NVENET_12                0x0268
  #define PCI_DEVICE_ID_NVIDIA_NVENET_13                0x0269
  #define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO      0x026B
@@@ -2196,12 -2188,7 +2198,12 @@@
  #define PCI_DEVICE_ID_ENE_1211                0x1211
  #define PCI_DEVICE_ID_ENE_1225                0x1225
  #define PCI_DEVICE_ID_ENE_1410                0x1410
 +#define PCI_DEVICE_ID_ENE_710         0x1411
 +#define PCI_DEVICE_ID_ENE_712         0x1412
  #define PCI_DEVICE_ID_ENE_1420                0x1420
 +#define PCI_DEVICE_ID_ENE_720         0x1421
 +#define PCI_DEVICE_ID_ENE_722         0x1422
 +
  #define PCI_VENDOR_ID_CHELSIO         0x1425
  
  #define PCI_VENDOR_ID_MIPS            0x153f