diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-14 00:02:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-14 00:02:22 +0200 |
| commit | b5c851a88a369854c04e511cefb84ea2d0cfa209 (patch) | |
| tree | 55084d3d51708f90f27d0a70db5ab63916942f14 | |
| parent | eb02ce017dd83985041a7e54c6449f92d53b026f (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: merge latest tracing fixes to avoid conflicts in
kernel/trace/trace_events_filter.c with upcoming change
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | Documentation/DocBook/Makefile | 11 | ||||
| -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/sparse.txt | 8 | ||||
| -rw-r--r-- | MAINTAINERS | 1576 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | arch/Kconfig | 3 | ||||
| -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) | 0 | ||||
| -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 | ||||
| -rw-r--r-- | arch/frv/include/asm/smp.h (renamed from include/asm-frv/smp.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/socket.h (renamed from include/asm-frv/socket.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/sockios.h (renamed from include/asm-frv/sockios.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/spinlock.h (renamed from include/asm-frv/spinlock.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/spr-regs.h (renamed from include/asm-frv/spr-regs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/stat.h (renamed from include/asm-frv/stat.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/statfs.h (renamed from include/asm-frv/statfs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/string.h (renamed from include/asm-frv/string.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/suspend.h (renamed from include/asm-frv/suspend.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/swab.h (renamed from include/asm-frv/swab.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/system.h (renamed from include/asm-frv/system.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/termbits.h (renamed from include/asm-frv/termbits.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/termios.h (renamed from include/asm-frv/termios.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/thread_info.h (renamed from include/asm-frv/thread_info.h) | 6 | ||||
| -rw-r--r-- | arch/frv/include/asm/timer-regs.h (renamed from include/asm-frv/timer-regs.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/timex.h (renamed from include/asm-frv/timex.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/tlb.h (renamed from include/asm-frv/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/tlbflush.h (renamed from include/asm-frv/tlbflush.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/topology.h (renamed from include/asm-frv/topology.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/types.h (renamed from include/asm-frv/types.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/uaccess.h (renamed from include/asm-frv/uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/ucontext.h (renamed from include/asm-frv/ucontext.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/unaligned.h (renamed from include/asm-frv/unaligned.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/unistd.h (renamed from include/asm-frv/unistd.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/user.h (renamed from include/asm-frv/user.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/vga.h (renamed from include/asm-frv/vga.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/virtconvert.h (renamed from include/asm-frv/virtconvert.h) | 0 | ||||
| -rw-r--r-- | arch/frv/include/asm/xor.h (renamed from include/asm-frv/xor.h) | 0 | ||||
| -rw-r--r-- | arch/microblaze/Kconfig | 141 | ||||
| -rw-r--r-- | arch/microblaze/Kconfig.debug | 26 | ||||
| -rw-r--r-- | arch/microblaze/Makefile | 69 | ||||
| -rw-r--r-- | arch/microblaze/boot/Makefile | 17 | ||||
| -rw-r--r-- | arch/microblaze/configs/nommu_defconfig | 804 |