Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

f499cae1 · Paul Mundt · fc3f55e6 · 80a04d3f · f499cae1 · f499cae1
Commit f499cae1 authored 16 years ago by Paul Mundt
20 changed files
--- a/include/asm-frv/device.h
+++ b/include/asm-frv/device.h
--- a/include/asm-frv/div64.h
+++ b/include/asm-frv/div64.h
--- a/include/asm-frv/dm9000.h
+++ b/include/asm-frv/dm9000.h
--- a/include/asm-frv/dma-mapping.h
+++ b/include/asm-frv/dma-mapping.h
--- a/include/asm-frv/dma.h
+++ b/include/asm-frv/dma.h
--- a/include/asm-frv/elf.h
+++ b/include/asm-frv/elf.h
--- a/include/asm-frv/emergency-restart.h
+++ b/include/asm-frv/emergency-restart.h
--- a/include/asm-frv/errno.h
+++ b/include/asm-frv/errno.h
--- a/include/asm-frv/fb.h
+++ b/include/asm-frv/fb.h
--- a/include/asm-frv/fcntl.h
+++ b/include/asm-frv/fcntl.h
--- a/include/asm-frv/fpu.h
+++ b/include/asm-frv/fpu.h
--- a/include/asm-frv/ftrace.h
+++ b/include/asm-frv/ftrace.h
--- a/include/asm-frv/futex.h
+++ b/include/asm-frv/futex.h
--- a/include/asm-frv/gdb-stub.h
+++ b/include/asm-frv/gdb-stub.h
--- a/include/asm-frv/gpio-regs.h
+++ b/include/asm-frv/gpio-regs.h
--- a/include/asm-frv/hardirq.h
+++ b/include/asm-frv/hardirq.h
--- a/include/asm-frv/highmem.h
+++ b/include/asm-frv/highmem.h
--- a/include/asm-frv/hw_irq.h
+++ b/include/asm-frv/hw_irq.h
--- a/include/asm-frv/init.h
+++ b/include/asm-frv/init.h
--- a/include/asm-frv/io.h
+++ b/include/asm-frv/io.h