diff options
author | Tony Lindgren <tony@atomide.com> | 2015-07-06 05:33:17 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-07-06 05:33:17 -0700 |
commit | ae745302c0a3e2b5b768690f631fc14db44467e7 (patch) | |
tree | 1db4d210a7419286b447dc09fa7400a561d55f42 /fs/file_table.c | |
parent | e3abe2556b2a689b28926cd1581f0b97e9d2afa4 (diff) | |
parent | 22a5dc10e3f8fb8370748ea19dc4e3e1620d8296 (diff) | |
download | linux-stable-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.gz linux-stable-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.bz2 linux-stable-ae745302c0a3e2b5b768690f631fc14db44467e7.zip |
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'fs/file_table.c')
-rw-r--r-- | fs/file_table.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index 294174dcc226..7f9d407c7595 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -20,7 +20,6 @@ #include <linux/cdev.h> #include <linux/fsnotify.h> #include <linux/sysctl.h> -#include <linux/lglock.h> #include <linux/percpu_counter.h> #include <linux/percpu.h> #include <linux/hardirq.h> |