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, 2 insertions, 2 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 83ba0ab2c915..649e5f86b5f0 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -652,8 +652,8 @@ struct ata_device {
                 u32             gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */
         };
 
-        /* Identify Device Data Log (30h), SATA Settings (page 08h) */
-        u8                      sata_settings[ATA_SECT_SIZE];
+        /* DEVSLP Timing Variables from Identify Device Data Log */
+        u8                      devslp_timing[ATA_LOG_DEVSLP_SIZE];
 
         /* error history */
         int                     spdn_cnt;