diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 09:22:04 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 09:22:04 +0100 |
| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch) | |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd /include/asm-m68k/futex.h | |
| parent | perf_counters: account NMI interrupts (diff) | |
| parent | Linux 2.6.29-rc4 (diff) | |
| download | linux-95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c.tar.xz linux-95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c.zip | |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
Diffstat (limited to 'include/asm-m68k/futex.h')
| -rw-r--r-- | include/asm-m68k/futex.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-m68k/futex.h b/include/asm-m68k/futex.h deleted file mode 100644 index 6a332a9f099c..000000000000 --- a/include/asm-m68k/futex.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_FUTEX_H -#define _ASM_FUTEX_H - -#include <asm-generic/futex.h> - -#endif |