diff --git a/[refs] b/[refs]
index 040a8f095388..817dc5f72d72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67e3e221d61c0e70b2f244fd921e5e601d6c7339
+refs/heads/master: 6866e7bc83f13a1bc6de59099930e9db1ab0042f
diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h
index 1f44cfb847e1..947cf84e555d 100644
--- a/trunk/include/linux/libata.h
+++ b/trunk/include/linux/libata.h
@@ -560,8 +560,8 @@ struct ata_ering {
 struct ata_device {
 	struct ata_link		*link;
 	unsigned int		devno;		/* 0 or 1 */
-	unsigned long		flags;		/* ATA_DFLAG_xxx */
 	unsigned int		horkage;	/* List of broken features */
+	unsigned long		flags;		/* ATA_DFLAG_xxx */
 	struct scsi_device	*sdev;		/* attached SCSI device */
 #ifdef CONFIG_ATA_ACPI
 	acpi_handle		acpi_handle;