diff options
| author | Ingo Molnar <[email protected]> | 2015-02-24 07:41:07 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-02-24 07:41:07 +0000 |
| commit | 2ae79026818e7d49fead82b79b1a543e3b9c8a23 (patch) | |
| tree | c7ee7bd8b37b0880918d361839fd95988fac2dac /lib/show_mem.c | |
| parent | locking/rwsem: Check for active lock before bailing on spinning (diff) | |
| parent | Linux 4.0-rc1 (diff) | |
| download | kernel-2ae79026818e7d49fead82b79b1a543e3b9c8a23.tar.gz kernel-2ae79026818e7d49fead82b79b1a543e3b9c8a23.zip | |
Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'lib/show_mem.c')
| -rw-r--r-- | lib/show_mem.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/show_mem.c b/lib/show_mem.c index 7de89f4a36cf..adc98e1825ba 100644 --- a/lib/show_mem.c +++ b/lib/show_mem.c @@ -6,7 +6,6 @@ */ #include <linux/mm.h> -#include <linux/nmi.h> #include <linux/quicklist.h> #include <linux/cma.h> |