Merge 3.8-rc5 into usb-next

This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in
linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 408da9502177..8f7a3d68371a 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -297,10 +297,12 @@ enum {
         ATA_LOG_SATA_NCQ        = 0x10,
         ATA_LOG_SATA_ID_DEV_DATA  = 0x30,
         ATA_LOG_SATA_SETTINGS     = 0x08,
-        ATA_LOG_DEVSLP_MDAT       = 0x30,
+        ATA_LOG_DEVSLP_OFFSET     = 0x30,
+        ATA_LOG_DEVSLP_SIZE       = 0x08,
+        ATA_LOG_DEVSLP_MDAT       = 0x00,
         ATA_LOG_DEVSLP_MDAT_MASK  = 0x1F,
-        ATA_LOG_DEVSLP_DETO       = 0x31,
-        ATA_LOG_DEVSLP_VALID      = 0x37,
+        ATA_LOG_DEVSLP_DETO       = 0x01,
+        ATA_LOG_DEVSLP_VALID      = 0x07,
         ATA_LOG_DEVSLP_VALID_MASK = 0x80,
 
         /* READ/WRITE LONG (obsolete) */