diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-08 10:50:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-08 10:50:00 +0200 |
| commit | f066a155334642b8a206eec625b1925d88c48aeb (patch) | |
| tree | cb12975e60b70d1dae3b7397bab955de78a4d01e /include/asm-frv/statfs.h | |
| parent | xen: add FIX_TEXT_POKE to fixmap (diff) | |
| parent | x86: xen, i386: reserve Xen pagetables (diff) | |
| download | linux-f066a155334642b8a206eec625b1925d88c48aeb.tar.xz linux-f066a155334642b8a206eec625b1925d88c48aeb.zip | |
Merge branch 'x86/urgent' into x86/xen
Conflicts:
arch/frv/include/asm/pgtable.h
arch/x86/include/asm/required-features.h
arch/x86/xen/mmu.c
Merge reason: x86/xen was on a .29 base still, move it to a fresher
branch and pick up Xen fixes as well, plus resolve
conflicts
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-frv/statfs.h')
| -rw-r--r-- | include/asm-frv/statfs.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-frv/statfs.h b/include/asm-frv/statfs.h deleted file mode 100644 index 741f586045ba..000000000000 --- a/include/asm-frv/statfs.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _ASM_STATFS_H -#define _ASM_STATFS_H - -#include <asm-generic/statfs.h> - -#endif /* _ASM_STATFS_H */ - |