diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 11:05:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 11:05:51 +0200 |
| commit | accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /arch/m68knommu/include/asm/tlb.h | |
| parent | 6852fd9b86d05063c6ef49d2e12e061cc7f6a105 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
| download | op-kernel-dev-accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6.zip op-kernel-dev-accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6.tar.gz | |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
Diffstat (limited to 'arch/m68knommu/include/asm/tlb.h')
| -rw-r--r-- | arch/m68knommu/include/asm/tlb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68knommu/include/asm/tlb.h b/arch/m68knommu/include/asm/tlb.h new file mode 100644 index 0000000..77a7c51 --- /dev/null +++ b/arch/m68knommu/include/asm/tlb.h @@ -0,0 +1 @@ +#include <asm-m68k/tlb.h> |
