Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Move include/asm-ia64 to arch/ia64/include/asm

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
2b12a4c5 · Linus Torvalds · 4744b434 · 7f30491c · 2b12a4c5 · 2b12a4c5
Commit 2b12a4c5 authored 16 years ago by Linus Torvalds
--- a/include/asm-ia64/Kbuild
+++ b/include/asm-ia64/Kbuild
--- a/include/asm-ia64/a.out.h
+++ b/include/asm-ia64/a.out.h
--- a/include/asm-ia64/acpi-ext.h
+++ b/include/asm-ia64/acpi-ext.h
--- a/include/asm-ia64/acpi.h
+++ b/include/asm-ia64/acpi.h
 /*
- *  asm-ia64/acpi.h
- *
 *  Copyright (C) 1999 VA Linux Systems
 *  Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
 *  Copyright (C) 2000,2001 J.I. Lee <jung-ik.lee@intel.com>

--- a/include/asm-ia64/agp.h
+++ b/include/asm-ia64/agp.h
--- a/include/asm-ia64/asmmacro.h
+++ b/include/asm-ia64/asmmacro.h
--- a/include/asm-ia64/atomic.h
+++ b/include/asm-ia64/atomic.h
--- a/include/asm-ia64/auxvec.h
+++ b/include/asm-ia64/auxvec.h
--- a/include/asm-ia64/bitops.h
+++ b/include/asm-ia64/bitops.h
--- a/include/asm-ia64/break.h
+++ b/include/asm-ia64/break.h
--- a/include/asm-ia64/bug.h
+++ b/include/asm-ia64/bug.h
--- a/include/asm-ia64/bugs.h
+++ b/include/asm-ia64/bugs.h
--- a/include/asm-ia64/byteorder.h
+++ b/include/asm-ia64/byteorder.h
--- a/include/asm-ia64/cache.h
+++ b/include/asm-ia64/cache.h
--- a/include/asm-ia64/cacheflush.h
+++ b/include/asm-ia64/cacheflush.h
--- a/include/asm-ia64/checksum.h
+++ b/include/asm-ia64/checksum.h
--- a/include/asm-ia64/compat.h
+++ b/include/asm-ia64/compat.h
--- a/include/asm-ia64/cpu.h
+++ b/include/asm-ia64/cpu.h
--- a/include/asm-ia64/cputime.h
+++ b/include/asm-ia64/cputime.h
 /*
- * include/asm-ia64/cputime.h:
+ * Definitions for measuring cputime on ia64 machines.
- *		Definitions for measuring cputime on ia64 machines.
 *
 * Based on <asm-powerpc/cputime.h>.
 *

--- a/include/asm-ia64/current.h
+++ b/include/asm-ia64/current.h