From 2aa5af5b550e66c3bef76fa038ecd913893f75ae Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 12 Dec 2012 13:51:56 -0800
Subject: [PATCH] --- yaml --- r: 343330 b: refs/heads/master c:
 05b0afd73d04109d87f00ccd39f099e217c37263 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/gfp.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6abd085262f5..a97435cc80d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2897b4d29d9fca82a57b09b8a216a5d604966e4b
+refs/heads/master: 05b0afd73d04109d87f00ccd39f099e217c37263
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 31e8041274f6..f74856e17e48 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -34,6 +34,7 @@ struct vm_area_struct;
 #define ___GFP_NO_KSWAPD	0x400000u
 #define ___GFP_OTHER_NODE	0x800000u
 #define ___GFP_WRITE		0x1000000u
+/* If the above are modified, __GFP_BITS_SHIFT may need updating */
 
 /*
  * GFP bitmasks..