aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-04-14 06:29:07 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-04-14 06:29:07 +0900
commitf499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch)
tree1af6235c18391212c40116eb90b01eae8938efee
parentfc3f55e672e1ed917dd9e215af81939cd3d717da (diff)
parent80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat
-rw-r--r--Documentation/DMA-mapping.txt18
-rw-r--r--Documentation/DocBook/Makefile11
-rw-r--r--Documentation/DocBook/kernel-api.tmpl2
-rw-r--r--Documentation/DocBook/writing-an-alsa-driver.tmpl8
-rw-r--r--Documentation/blockdev/00-INDEX2
-rw-r--r--Documentation/blockdev/mflash.txt84
-rw-r--r--Documentation/cgroups/cpuacct.txt18
-rw-r--r--Documentation/devices.txt6
-rw-r--r--Documentation/fb/uvesafb.txt7
-rw-r--r--Documentation/feature-removal-schedule.txt12
-rw-r--r--Documentation/filesystems/00-INDEX2
-rw-r--r--Documentation/filesystems/knfsd-stats.txt159
-rw-r--r--Documentation/filesystems/nfs41-server.txt161
-rw-r--r--Documentation/filesystems/nilfs2.txt200
-rw-r--r--Documentation/hwmon/g760a36
-rw-r--r--Documentation/infiniband/ipoib.txt45
-rw-r--r--Documentation/input/rotary-encoder.txt101
-rw-r--r--Documentation/isdn/README.gigaset52
-rw-r--r--Documentation/kbuild/makefiles.txt83
-rw-r--r--Documentation/kernel-parameters.txt481
-rw-r--r--Documentation/kprobes.txt38
-rw-r--r--Documentation/powerpc/dts-bindings/fsl/upm-nand.txt39
-rw-r--r--Documentation/powerpc/dts-bindings/gpio/led.txt46
-rw-r--r--Documentation/scsi/aacraid.txt15
-rw-r--r--Documentation/sound/alsa/soc/jack.txt71
-rw-r--r--Documentation/sparse.txt8
-rw-r--r--Documentation/sysctl/vm.txt28
-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--Documentation/video4linux/pxa_camera.txt125
-rw-r--r--Documentation/video4linux/v4l2-framework.txt21
-rw-r--r--MAINTAINERS1596
-rw-r--r--Makefile12
-rw-r--r--arch/Kconfig3
-rw-r--r--arch/arm/configs/magician_defconfig6
-rw-r--r--arch/arm/include/asm/sizes.h1
-rw-r--r--arch/arm/mach-at91/include/mach/board.h2
-rw-r--r--arch/arm/mach-davinci/board-evm.c4
-rw-r--r--arch/arm/mach-davinci/include/mach/nand.h80
-rw-r--r--arch/arm/mach-davinci/usb.c4
-rw-r--r--arch/arm/mach-iop13xx/setup.c8
-rw-r--r--arch/arm/mach-iop13xx/tpmi.c10
-rw-r--r--arch/arm/mach-kirkwood/common.c10
-rw-r--r--arch/arm/mach-mx1/Makefile3
-rw-r--r--arch/arm/mach-mx1/devices.c2
-rw-r--r--arch/arm/mach-mx1/ksym_mx1.c18
-rw-r--r--arch/arm/mach-mx1/mx1_camera_fiq.S35
-rw-r--r--arch/arm/mach-mx3/clock.c2
-rw-r--r--arch/arm/mach-omap1/clock.c21
-rw-r--r--arch/arm/mach-orion5x/common.c6
-rw-r--r--arch/arm/mach-pxa/Kconfig9
-rw-r--r--arch/arm/mach-pxa/Makefile1
-rw-r--r--arch/arm/mach-pxa/cm-x2xx.c2
-rw-r--r--arch/arm/mach-pxa/colibri-pxa300.c11
-rw-r--r--arch/arm/mach-pxa/colibri-pxa320.c10
-rw-r--r--arch/arm/mach-pxa/colibri-pxa3xx.c35
-rw-r--r--arch/arm/mach-pxa/csb701.c5
-rw-r--r--arch/arm/mach-pxa/e740.c2
-rw-r--r--arch/arm/mach-pxa/e750.c2
-rw-r--r--arch/arm/mach-pxa/e800.c2
-rw-r--r--arch/arm/mach-pxa/em-x270.c86
-rw-r--r--arch/arm/mach-pxa/include/mach/colibri.h7
-rw-r--r--arch/arm/mach-pxa/include/mach/magician.h4
-rw-r--r--arch/arm/mach-pxa/include/mach/palmld.h1
-rw-r--r--arch/arm/mach-pxa/include/mach/palmt5.h1
-rw-r--r--arch/arm/mach-pxa/include/mach/palmte2.h68
-rw-r--r--arch/arm/mach-pxa/include/mach/palmtx.h2
-rw-r--r--arch/arm/mach-pxa/include/mach/pxa2xx_spi.h1
-rw-r--r--arch/arm/mach-pxa/include/mach/pxa3xx_nand.h3
-rw-r--r--arch/arm/mach-pxa/magician.c84
-rw-r--r--arch/arm/mach-pxa/mioa701.c6
-rw-r--r--arch/arm/mach-pxa/palmld.c36
-rw-r--r--arch/arm/mach-pxa/palmt5.c35
-rw-r--r--arch/arm/mach-pxa/palmte2.c466
-rw-r--r--arch/arm/mach-pxa/palmtx.c35
-rw-r--r--arch/arm/mach-pxa/tosa.c2
-rw-r--r--arch/arm/mach-s3c2410/mach-bast.c3
-rw-r--r--arch/arm/mach-s3c2410/mach-n30.c3
-rw-r--r--arch/arm/mach-s3c2412/mach-jive.c3
-rw-r--r--arch/arm/mm/mmu.c11
-rw-r--r--arch/arm/plat-iop/adma.c8
-rw-r--r--arch/arm/plat-mxc/include/mach/i2c.h25
-rw-r--r--arch/arm/plat-mxc/include/mach/memory.h8
-rw-r--r--arch/arm/plat-mxc/include/mach/mx1_camera.h35
-rw-r--r--arch/arm/plat-s3c/dev-i2c0.c7
-rw-r--r--arch/arm/plat-s3c/dev-i2c1.c7
-rw-r--r--arch/arm/plat-s3c/include/plat/iic.h33
-rw-r--r--arch/avr32/boards/hammerhead/flash.c4
-rw-r--r--arch/avr32/mach-at32ap/at32ap700x.c8
-rw-r--r--arch/blackfin/include/asm/bfin5xx_spi.h5
-rw-r--r--arch/blackfin/kernel/process.c2
-rw-r--r--arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h10
-rw-r--r--arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h36
-rw-r--r--arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h29
-rw-r--r--arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h37
-rw-r--r--arch/blackfin/mach-bf538/include/mach/bfin_serial_5xx.h10
-rw-r--r--arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h117
-rw-r--r--arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h29
-rw-r--r--arch/cris/include/asm/ioctls.h5
-rw-r--r--arch/cris/include/asm/rs485.h8
-rw-r--r--arch/cris/include/asm/termios.h1
-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