Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2026-09-16 18:15:52 +00:00 · 2006-06-28 23:27:48 -04:00 · 2006-06-28 23:27:48 -04:00 · 9f2fa46638
commit 9f2fa46638
parent 607f31e80b 0a6047eef1
239 changed files with 3173 additions and 2232 deletions
--- a/include/asm-arm/arch-at91rm9200/memory.h
+++ b/include/asm-arm/arch-at91rm9200/memory.h
--- a/include/asm-arm/arch-h720x/memory.h
+++ b/include/asm-arm/arch-h720x/memory.h
--- a/include/asm-arm/arch-imx/memory.h
+++ b/include/asm-arm/arch-imx/memory.h
--- a/include/asm-arm/arch-ixp23xx/ixp23xx.h
+++ b/include/asm-arm/arch-ixp23xx/ixp23xx.h
--- a/include/asm-arm/arch-ixp23xx/platform.h
+++ b/include/asm-arm/arch-ixp23xx/platform.h
--- a/include/asm-arm/arch-ixp23xx/uncompress.h
+++ b/include/asm-arm/arch-ixp23xx/uncompress.h
--- a/include/asm-arm/arch-s3c2410/regs-dsc.h
+++ b/include/asm-arm/arch-s3c2410/regs-dsc.h
--- a/include/asm-arm/bugs.h
+++ b/include/asm-arm/bugs.h
--- a/include/asm-arm/domain.h
+++ b/include/asm-arm/domain.h
--- a/include/asm-arm/fpstate.h
+++ b/include/asm-arm/fpstate.h
--- a/include/asm-arm/mach/map.h
+++ b/include/asm-arm/mach/map.h
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
--- a/include/asm-arm/mmu.h
+++ b/include/asm-arm/mmu.h
--- a/include/asm-arm/mmu_context.h
+++ b/include/asm-arm/mmu_context.h
--- a/include/asm-arm/page-nommu.h
+++ b/include/asm-arm/page-nommu.h
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
--- a/include/asm-arm/pgalloc.h
+++ b/include/asm-arm/pgalloc.h
--- a/include/asm-arm/pgtable-nommu.h
+++ b/include/asm-arm/pgtable-nommu.h
--- a/include/asm-arm/pgtable.h
+++ b/include/asm-arm/pgtable.h
--- a/include/asm-arm/proc-fns.h
+++ b/include/asm-arm/proc-fns.h
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
--- a/include/asm-arm/thread_info.h
+++ b/include/asm-arm/thread_info.h
--- a/include/asm-arm/uaccess.h
+++ b/include/asm-arm/uaccess.h
--- a/include/asm-arm/ucontext.h
+++ b/include/asm-arm/ucontext.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
--- a/include/asm-m68knommu/bootstd.h
+++ b/include/asm-m68knommu/bootstd.h
--- a/include/linux/ac97_codec.h
+++ b/include/linux/ac97_codec.h
--- a/include/linux/coda_linux.h
+++ b/include/linux/coda_linux.h
--- a/include/linux/efs_fs.h
+++ b/include/linux/efs_fs.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
--- a/include/linux/module.h
+++ b/include/linux/module.h
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/plist.h
+++ b/include/linux/plist.h
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
--- a/include/linux/ufs_fs.h
+++ b/include/linux/ufs_fs.h
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h