Merge branch 'linux-2.6' into powerpc-next

2026-09-20 18:15:29 +00:00 · 2008-05-16 23:13:42 +10:00 · 2008-05-16 23:13:42 +10:00 · fcff474ea5
commit fcff474ea5
parent 541b2755c2 f26a398891
504 changed files with 17040 additions and 5274 deletions
--- a/include/asm-alpha/barrier.h
+++ b/include/asm-alpha/barrier.h
--- a/include/asm-alpha/param.h
+++ b/include/asm-alpha/param.h
--- a/include/asm-alpha/pgtable.h
+++ b/include/asm-alpha/pgtable.h
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
--- a/include/asm-h8300/param.h
+++ b/include/asm-h8300/param.h
--- a/include/asm-ia64/machvec.h
+++ b/include/asm-ia64/machvec.h
--- a/include/asm-ia64/machvec_uv.h
+++ b/include/asm-ia64/machvec_uv.h
--- a/include/asm-ia64/uv/uv_hub.h
+++ b/include/asm-ia64/uv/uv_hub.h
--- a/include/asm-ia64/uv/uv_mmrs.h
+++ b/include/asm-ia64/uv/uv_mmrs.h
--- a/include/asm-parisc/assembly.h
+++ b/include/asm-parisc/assembly.h
--- a/include/asm-parisc/ioctl.h
+++ b/include/asm-parisc/ioctl.h
--- a/include/asm-parisc/ioctls.h
+++ b/include/asm-parisc/ioctls.h
--- a/include/asm-parisc/termbits.h
+++ b/include/asm-parisc/termbits.h
--- a/include/asm-parisc/termios.h
+++ b/include/asm-parisc/termios.h
--- a/include/asm-powerpc/mmu-hash64.h
+++ b/include/asm-powerpc/mmu-hash64.h
--- a/include/asm-powerpc/pgtable-ppc64.h
+++ b/include/asm-powerpc/pgtable-ppc64.h
--- a/include/asm-powerpc/uaccess.h
+++ b/include/asm-powerpc/uaccess.h
--- a/include/asm-s390/debug.h
+++ b/include/asm-s390/debug.h
--- a/include/asm-sparc/mman.h
+++ b/include/asm-sparc/mman.h
--- a/include/asm-sparc64/mman.h
+++ b/include/asm-sparc64/mman.h
--- a/include/asm-sparc64/thread_info.h
+++ b/include/asm-sparc64/thread_info.h
--- a/include/asm-um/irq.h
+++ b/include/asm-um/irq.h
--- a/include/asm-um/keyboard.h
+++ b/include/asm-um/keyboard.h
--- a/include/asm-um/page.h
+++ b/include/asm-um/page.h
--- a/include/asm-um/param.h
+++ b/include/asm-um/param.h
--- a/include/asm-v850/param.h
+++ b/include/asm-v850/param.h
--- a/include/asm-x86/pgtable.h
+++ b/include/asm-x86/pgtable.h
--- a/include/asm-xtensa/param.h
+++ b/include/asm-xtensa/param.h
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/parser.h
+++ b/include/linux/parser.h
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
--- a/include/linux/usb/association.h
+++ b/include/linux/usb/association.h
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
--- a/include/net/9p/transport.h
+++ b/include/net/9p/transport.h
--- a/include/net/irda/discovery.h
+++ b/include/net/irda/discovery.h
--- a/include/net/syncppp.h
+++ b/include/net/syncppp.h
--- a/include/sound/soc.h
+++ b/include/sound/soc.h