From 984186f2f1bbe2e2cf489bb661c88f92c7cc10c2 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 11 Apr 2013 23:55:54 +0100
Subject: [PATCH] --- yaml --- r: 370111 b: refs/heads/master c:
 303eb7e2c982fda734455f068633241db89d3175 h: refs/heads/master i:   370109:
 7af3e6d6789faebdb7ed0d64bd16250d8692fefa   370107:
 51c6c485bb0eb051de20d88c9beb000fbf96c528   370103:
 a62227d126ef0361f65f1bdf412f435f49b8e1d3   370095:
 2a06b5ae3804b0113e358c6120831c311cfa5715   370079:
 d370b6d1371f66fb3b17e4a7665bd20d91cb0586   370047:
 681d71d4ef83f1713be70e1641cc518b518a2f92 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/firmware/efivars.c | 1 +
 trunk/fs/proc/inode.c            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c6bf1434d6a0..4f85dbd35b5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d01ff2583086fd532181d2ee16112f5342eb78d
+refs/heads/master: 303eb7e2c982fda734455f068633241db89d3175
diff --git a/trunk/drivers/firmware/efivars.c b/trunk/drivers/firmware/efivars.c
index 7acafb80fd4c..0f1026019c0f 100644
--- a/trunk/drivers/firmware/efivars.c
+++ b/trunk/drivers/firmware/efivars.c
@@ -80,6 +80,7 @@
 #include <linux/slab.h>
 #include <linux/pstore.h>
 #include <linux/ctype.h>
+#include <linux/magic.h>
 
 #include <linux/fs.h>
 #include <linux/ramfs.h>
diff --git a/trunk/fs/proc/inode.c b/trunk/fs/proc/inode.c
index d50224c70215..bd2f76427fec 100644
--- a/trunk/fs/proc/inode.c
+++ b/trunk/fs/proc/inode.c
@@ -22,6 +22,7 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/mount.h>
+#include <linux/magic.h>
 
 #include <asm/uaccess.h>