From 33188225b816525ff8a005ab112f6dd51945f6d8 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Jul 2011 23:21:50 -0700
Subject: [PATCH] --- yaml --- r: 261086 b: refs/heads/master c:
 59ed2bb27492f74ab898ee1e26c69dfd78444640 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/ext2/acl.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d63079994361..724d45f2729b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55f9c40ff632d03c527d6a6ceddcda0a224587a6
+refs/heads/master: 59ed2bb27492f74ab898ee1e26c69dfd78444640
diff --git a/trunk/fs/ext2/acl.h b/trunk/fs/ext2/acl.h
index 5c0a6a4fb052..503bfb0ed79b 100644
--- a/trunk/fs/ext2/acl.h
+++ b/trunk/fs/ext2/acl.h
@@ -61,7 +61,6 @@ extern int ext2_init_acl (struct inode *, struct inode *);
 #else
 #include <linux/sched.h>
 #define ext2_get_acl	NULL
-#define ext2_get_acl	NULL
 #define ext2_set_acl	NULL
 
 static inline int