Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (54 commits)
  Revert "pata_sis: Implement MWDMA for the UDMA 133 capable chips"
  libata: Clarify ata_set_lba_range_entries function
  libata: Report zeroed read after TRIM and max discard size
  pata_hpt3x2n: fix overclocked MWDMA0 timing
  pata_it8213: MWDMA0 is unsupported
  [libata] MWDMA0 is unsupported on PIIX-like PATA controllers
  pata_via: clear UDMA transfer mode bit for PIO and MWDMA
  pata_sis: Power Management fix
  pata_rz1000: Power Management fix
  pata_radisys: fix UDMA handling
  pata_ns87415: Power Management fix
  pata_marvell: fix marvell_pre_reset() documentation
  pata_legacy: add pointers to QDI65x0 documentation
  pata_legacy: fix access to control register for QDI6580
  pata_legacy: fix QDI6580DP support
  pata_it8213: fix it8213_pre_reset() documentation
  pata_it8213: fix wrong MWDMA timings being programmed
  pata_it8213: fix PIO2 underclocking
  pata_it8213: fix wrong PIO timings being programmed
  pata_it8213: fix UDMA handling
  ...

diff --combined include/linux/pci_ids.h
index daecca3c83008f480359878bf9b9f4ce80ee1748,9ca483be68d508b1afcefe5ac4eda13556cd8166..cabf074b43244a854296dc18402a9b07d092401f
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1496,9 -1496,10 +1496,10 @@@
  #define PCI_DEVICE_ID_SBE_WANXL400    0x0104
  
  #define PCI_VENDOR_ID_TOSHIBA         0x1179
- #define PCI_DEVICE_ID_TOSHIBA_PICCOLO 0x0102
- #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1       0x0103
- #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2       0x0105
+ #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1       0x0101
+ #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2       0x0102
+ #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_3       0x0103
+ #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_5       0x0105
  #define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a
  #define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f
  #define PCI_DEVICE_ID_TOSHIBA_TOPIC100        0x0617
@@@ -1633,8 -1634,6 +1634,8 @@@
  #define PCI_DEVICE_ID_O2_6730         0x673a
  #define PCI_DEVICE_ID_O2_6832         0x6832
  #define PCI_DEVICE_ID_O2_6836         0x6836
 +#define PCI_DEVICE_ID_O2_6812         0x6872
 +#define PCI_DEVICE_ID_O2_6933         0x6933
  
  #define PCI_VENDOR_ID_3DFX            0x121a
  #define PCI_DEVICE_ID_3DFX_VOODOO     0x0001