Index: ata/ata_da.c
===================================================================
--- ata/ata_da.c	(revision 357144)
+++ ata/ata_da.c	(working copy)
@@ -610,10 +610,18 @@
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Micron 5100 MTFDDAK*", "*" },
		/*quirks*/ADA_Q_4K 
 	},
 	{
 		/*
+		 * Micron 5300 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Micron_5300_MTFD*", "*" },
+		/*quirks*/ADA_Q_4K | ADA_Q_NO_TRIM
+	},
+	{
+		/*
 		 * OCZ Agility 2 SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */
Index: scsi/scsi_da.c
===================================================================
--- scsi/scsi_da.c	(revision 357144)
+++ scsi/scsi_da.c	(working copy)
@@ -890,6 +890,11 @@
 		/*quirks*/DA_Q_4K
 	},
 	{
+		/* Micron Advanced Format (4k) drives */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Micron_5300_MTFD*", "*" },
+		/*quirks*/DA_Q_4K | DA_Q_NO_UNMAP
+	},
+	{