diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-16 17:35:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-16 17:35:26 -0700 |
| commit | a54bfa40fd16aeb90bc556189221576f746f8567 (patch) | |
| tree | 176bb7a99ffab5f42f0dd4e9671f335be3f3efa0 | |
| parent | fe957c40ec5e2763b9977c565beab3bde3aaf85b (diff) | |
| parent | 134ffb4cad92a6aa534e55a9be145bca780a32c1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | Documentation/DocBook/Makefile | 11 | ||||
| -rw-r--r-- | Documentation/cgroups/cpuacct.txt | 18 | ||||
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 9 | ||||
| -rw-r--r-- | Documentation/infiniband/ipoib.txt | 45 | ||||
| -rw-r--r-- | Documentation/input/rotary-encoder.txt | 101 | ||||
| -rw-r--r-- | Documentation/kbuild/makefiles.txt | 83 | ||||
| -rw-r--r-- | Documentation/networking/bonding.txt | 2 | ||||
| -rw-r--r-- | Documentation/sparse.txt | 8 | ||||
| -rw-r--r-- | Documentation/trace/ftrace.txt (renamed from Documentation/ftrace.txt) | 0 | ||||
| -rw-r--r-- | Documentation/trace/kmemtrace.txt (renamed from Documentation/vm/kmemtrace.txt) | 0 | ||||
| -rw-r--r-- | Documentation/trace/mmiotrace.txt (renamed from Documentation/tracers/mmiotrace.txt) | 0 | ||||
| -rw-r--r-- | Documentation/trace/tracepoints.txt (renamed from Documentation/tracepoints.txt) | 0 | ||||
| -rw-r--r-- | MAINTAINERS | 1597 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | arch/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/magician_defconfig | 6 | ||||
| -rw-r--r-- | arch/arm/include/asm/sizes.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/board.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/clock.c | 21 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 9 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/cm-x2xx.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa300.c | 11 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa320.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa3xx.c | 35 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/csb701.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/e740.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/e750.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/e800.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 86 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/colibri.h | 7 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/magician.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/palmld.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/palmt5.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/palmte2.h | 68 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/palmtx.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/magician.c | 84 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/palmld.c | 36 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/palmt5.c | 35 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/palmte2.c | 466 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/palmtx.c | 35 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 2 | ||||
| -rw-r--r-- | arch/arm/mm/mmu.c | 11 | ||||
| -rw-r--r-- | arch/frv/include/asm/Kbuild (renamed from include/asm-frv/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/atomic.h (renamed from include/asm-frv/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/auxvec.h (renamed from include/asm-frv/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/ax88796.h (renamed from include/asm-frv/ax88796.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/bitops.h (renamed from include/asm-frv/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/bug.h (renamed from include/asm-frv/bug.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/bugs.h (renamed from include/asm-frv/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/busctl-regs.h (renamed from include/asm-frv/busctl-regs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/byteorder.h (renamed from include/asm-frv/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/cache.h (renamed from include/asm-frv/cache.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/cacheflush.h (renamed from include/asm-frv/cacheflush.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/checksum.h (renamed from include/asm-frv/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/cpu-irqs.h (renamed from include/asm-frv/cpu-irqs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/cpumask.h (renamed from include/asm-frv/cpumask.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/cputime.h (renamed from include/asm-frv/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/current.h (renamed from include/asm-frv/current.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/delay.h (renamed from include/asm-frv/delay.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/device.h (renamed from include/asm-frv/device.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/div64.h (renamed from include/asm-frv/div64.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/dm9000.h (renamed from include/asm-frv/dm9000.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/dma-mapping.h (renamed from include/asm-frv/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/dma.h (renamed from include/asm-frv/dma.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/elf.h (renamed from include/asm-frv/elf.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/emergency-restart.h (renamed from include/asm-frv/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/errno.h (renamed from include/asm-frv/errno.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/fb.h (renamed from include/asm-frv/fb.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/fcntl.h (renamed from include/asm-frv/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/fpu.h (renamed from include/asm-frv/fpu.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/ftrace.h (renamed from include/asm-frv/ftrace.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/futex.h (renamed from include/asm-frv/futex.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/gdb-stub.h (renamed from include/asm-frv/gdb-stub.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/gpio-regs.h (renamed from include/asm-frv/gpio-regs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/hardirq.h (renamed from include/asm-frv/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/highmem.h (renamed from include/asm-frv/highmem.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/hw_irq.h (renamed from include/asm-frv/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/init.h (renamed from include/asm-frv/init.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/io.h (renamed from include/asm-frv/io.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/ioctl.h (renamed from include/asm-frv/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/ioctls.h (renamed from include/asm-frv/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/ipcbuf.h (renamed from include/asm-frv/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/irc-regs.h (renamed from include/asm-frv/irc-regs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/irq.h (renamed from include/asm-frv/irq.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/irq_regs.h (renamed from include/asm-frv/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/kdebug.h (renamed from include/asm-frv/kdebug.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/kmap_types.h (renamed from include/asm-frv/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/linkage.h (renamed from include/asm-frv/linkage.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/local.h (renamed from include/asm-frv/local.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/math-emu.h (renamed from include/asm-frv/math-emu.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mb-regs.h (renamed from include/asm-frv/mb-regs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mb86943a.h (renamed from include/asm-frv/mb86943a.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mb93091-fpga-irqs.h (renamed from include/asm-frv/mb93091-fpga-irqs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mb93093-fpga-irqs.h (renamed from include/asm-frv/mb93093-fpga-irqs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mb93493-irqs.h (renamed from include/asm-frv/mb93493-irqs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mb93493-regs.h (renamed from include/asm-frv/mb93493-regs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mc146818rtc.h (renamed from include/asm-frv/mc146818rtc.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mem-layout.h (renamed from include/asm-frv/mem-layout.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mman.h (renamed from include/asm-frv/mman.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mmu.h (renamed from include/asm-frv/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mmu_context.h (renamed from include/asm-frv/mmu_context.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/module.h (renamed from include/asm-frv/module.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/msgbuf.h (renamed from include/asm-frv/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/mutex.h (renamed from include/asm-frv/mutex.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/page.h (renamed from include/asm-frv/page.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/param.h (renamed from include/asm-frv/param.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/pci.h (renamed from include/asm-frv/pci.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/percpu.h (renamed from include/asm-frv/percpu.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/pgalloc.h (renamed from include/asm-frv/pgalloc.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/pgtable.h (renamed from include/asm-frv/pgtable.h) | 6 | ||||
| -rw-r--r-- | arch/frv/include/asm/poll.h (renamed from include/asm-frv/poll.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/posix_types.h (renamed from include/asm-frv/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/processor.h (renamed from include/asm-frv/processor.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/ptrace.h (renamed from include/asm-frv/ptrace.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/registers.h (renamed from include/asm-frv/registers.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/resource.h (renamed from include/asm-frv/resource.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/scatterlist.h (renamed from include/asm-frv/scatterlist.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/sections.h (renamed from include/asm-frv/sections.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/segment.h (renamed from include/asm-frv/segment.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/sembuf.h (renamed from include/asm-frv/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/serial-regs.h (renamed from include/asm-frv/serial-regs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/serial.h (renamed from include/asm-frv/serial.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/setup.h (renamed from include/asm-frv/setup.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/shmbuf.h (renamed from include/asm-frv/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/shmparam.h (renamed from include/asm-frv/shmparam.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/sigcontext.h (renamed from include/asm-frv/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/siginfo.h (renamed from include/asm-frv/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/signal.h (renamed from include/asm-frv/signal.h) | 0 | ||||