diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 11:38:13 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 11:38:13 +0100 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /arch/x86/um/ldt.c | |
| parent | mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions() (diff) | |
| parent | mtd: nand: fix Samsung SLC detection regression (diff) | |
| download | linux-851462444d421c223965b12b836bef63da61b57f.tar.xz linux-851462444d421c223965b12b836bef63da61b57f.zip | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'arch/x86/um/ldt.c')
| -rw-r--r-- | arch/x86/um/ldt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/um/ldt.c b/arch/x86/um/ldt.c index 26b0e39d2ce9..8e08176f0bcb 100644 --- a/arch/x86/um/ldt.c +++ b/arch/x86/um/ldt.c @@ -7,11 +7,11 @@ #include <linux/sched.h> #include <linux/slab.h> #include <asm/unistd.h> -#include "os.h" -#include "proc_mm.h" -#include "skas.h" -#include "skas_ptrace.h" -#include "sysdep/tls.h" +#include <os.h> +#include <proc_mm.h> +#include <skas.h> +#include <skas_ptrace.h> +#include <sysdep/tls.h> extern int modify_ldt(int func, void *ptr, unsigned long bytecount); |