diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-01 18:22:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-01 18:22:55 -0800 |
| commit | 6bba07c613e6663e5b8977eafec3cd3e63241e1c (patch) | |
| tree | a650baf4e935976b10911306ffbe6b53d66f88c7 /arch/s390/kernel | |
| parent | d7e53922aa47b7a5a91bc34da00348e6ee0ed242 (diff) | |
| parent | 892365ab4d29ed861709ee8611b53587ca2bb75f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
[S390] memory hotplug: prevent memory zone interleave
[S390] crash_dump: remove duplicate include
[S390] KEYS: Enable the compat keyctl wrapper on s390x
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/crash_dump.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c index 39f8fd4438fc..c383ce440d99 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c @@ -11,7 +11,6 @@ #include <linux/module.h> #include <linux/gfp.h> #include <linux/slab.h> -#include <linux/crash_dump.h> #include <linux/bootmem.h> #include <linux/elf.h> #include <asm/ipl.h> |