diff --git a/[refs] b/[refs]
index b78ac5a1fd67..7f0f8d38ef6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2011247550c1b903a9ecd68f6eb3e9e7b7b07f52
+refs/heads/master: 39b7e2878e783af027ddd3530f7a0abec330905d
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index b14f830cb0fa..8f35f0e03518 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2891,6 +2891,11 @@ sub process {
 			WARN("__packed is preferred over __attribute__((packed))\n" . $herecurr);
 		}
 
+# Check for __attribute__ aligned, prefer __aligned
+		if ($line =~ /\b__attribute__\s*\(\s*\(.*aligned/) {
+			WARN("__aligned(size) is preferred over __attribute__((aligned(size)))\n" . $herecurr);
+		}
+
 # check for sizeof(&)
 		if ($line =~ /\bsizeof\s*\(\s*\&/) {
 			WARN("sizeof(& should be avoided\n" . $herecurr);