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

1 files changed, 0 insertions, 14 deletions

diff --git a/include/asm-m68k/cachectl.h b/include/asm-m68k/cachectl.h
deleted file mode 100644
index 525978e959e3..000000000000
--- a/include/asm-m68k/cachectl.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _M68K_CACHECTL_H
-#define _M68K_CACHECTL_H
-
-/* Definitions for the cacheflush system call.  */
-
-#define FLUSH_SCOPE_LINE    1   /* Flush a cache line */
-#define FLUSH_SCOPE_PAGE    2   /* Flush a page */
-#define FLUSH_SCOPE_ALL     3   /* Flush the whole cache -- superuser only */
-
-#define FLUSH_CACHE_DATA    1   /* Writeback and flush data cache */
-#define FLUSH_CACHE_INSN    2   /* Flush instruction cache */
-#define FLUSH_CACHE_BOTH    3   /* Flush both caches */
-
-#endif /* _M68K_CACHECTL_H */