diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 10:24:31 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 10:24:31 +0100 |
| commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
| tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 | |
| parent | a23ce6da9677d245aa0aadc99f4197030350ab54 (diff) | |
| parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff) | |
Merge branch 'master' into for-next
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | Documentation/ABI/stable/thermal-notification | 4 | ||||
| -rw-r--r-- | Documentation/ABI/testing/sysfs-platform-at91 | 25 | ||||
| -rw-r--r-- | Documentation/DocBook/80211.tmpl | 21 | ||||
| -rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 4 | ||||
| -rw-r--r-- | Documentation/DocBook/dvb/dvbapi.xml | 2 | ||||
| -rw-r--r-- | Documentation/DocBook/media.tmpl | 4 | ||||
| -rw-r--r-- | Documentation/DocBook/v4l/dev-rds.xml | 6 | ||||
| -rw-r--r-- | Documentation/DocBook/v4l/v4l2.xml | 3 | ||||
| -rw-r--r-- | Documentation/IPMI.txt | 27 | ||||
| -rw-r--r-- | Documentation/acpi/apei/output_format.txt | 122 | ||||
| -rw-r--r-- | Documentation/arm/Booting | 33 | ||||
| -rw-r--r-- | Documentation/device-mapper/dm-crypt.txt | 7 | ||||
| -rw-r--r-- | Documentation/device-mapper/dm-raid.txt | 70 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/ata/fsl-sata.txt (renamed from Documentation/powerpc/dts-bindings/fsl/sata.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/eeprom.txt (renamed from Documentation/powerpc/dts-bindings/eeprom.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/8xxx_gpio.txt (renamed from Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio.txt (renamed from Documentation/powerpc/dts-bindings/gpio/gpio.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/led.txt (renamed from Documentation/powerpc/dts-bindings/gpio/led.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/fsl-i2c.txt (renamed from Documentation/powerpc/dts-bindings/fsl/i2c.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/marvell.txt (renamed from Documentation/powerpc/dts-bindings/marvell.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/fsl-esdhc.txt (renamed from Documentation/powerpc/dts-bindings/fsl/esdhc.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt (renamed from Documentation/powerpc/dts-bindings/mmc-spi-slot.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt (renamed from Documentation/powerpc/dts-bindings/fsl/upm-nand.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/mtd-physmap.txt (renamed from Documentation/powerpc/dts-bindings/mtd-physmap.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/mpc5xxx-mscan.txt (renamed from Documentation/powerpc/dts-bindings/fsl/can.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/sja1000.txt (renamed from Documentation/powerpc/dts-bindings/can/sja1000.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/fsl-tsec-phy.txt (renamed from Documentation/powerpc/dts-bindings/fsl/tsec.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/mdio-gpio.txt (renamed from Documentation/powerpc/dts-bindings/gpio/mdio.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/phy.txt (renamed from Documentation/powerpc/dts-bindings/phy.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/pci/83xx-512x-pci.txt (renamed from Documentation/powerpc/dts-bindings/fsl/83xx-512x-pci.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/4xx/cpm.txt (renamed from Documentation/powerpc/dts-bindings/4xx/cpm.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/4xx/emac.txt (renamed from Documentation/powerpc/dts-bindings/4xx/emac.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/4xx/ndfc.txt (renamed from Documentation/powerpc/dts-bindings/4xx/ndfc.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/4xx/ppc440spe-adma.txt (renamed from Documentation/powerpc/dts-bindings/4xx/ppc440spe-adma.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/4xx/reboot.txt (renamed from Documentation/powerpc/dts-bindings/4xx/reboot.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/board.txt (renamed from Documentation/powerpc/dts-bindings/fsl/board.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/brg.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/brg.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/i2c.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/i2c.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/pic.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/pic.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/usb.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/cpm/usb.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/gpio.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/network.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/firmware.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/par_io.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/par_io.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/pincfg.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/pincfg.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/ucc.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/ucc.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/usb.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/serial.txt (renamed from Documentation/powerpc/dts-bindings/fsl/cpm_qe/serial.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/diu.txt (renamed from Documentation/powerpc/dts-bindings/fsl/diu.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/dma.txt (renamed from Documentation/powerpc/dts-bindings/fsl/dma.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/ecm.txt (renamed from Documentation/powerpc/dts-bindings/ecm.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/gtm.txt (renamed from Documentation/powerpc/dts-bindings/fsl/gtm.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/guts.txt (renamed from Documentation/powerpc/dts-bindings/fsl/guts.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/lbc.txt (renamed from Documentation/powerpc/dts-bindings/fsl/lbc.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/mcm.txt (renamed from Documentation/powerpc/dts-bindings/fsl/mcm.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/mcu-mpc8349emitx.txt (renamed from Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/mpc5121-psc.txt (renamed from Documentation/powerpc/dts-bindings/fsl/mpc5121-psc.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/mpc5200.txt (renamed from Documentation/powerpc/dts-bindings/fsl/mpc5200.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/mpic.txt (renamed from Documentation/powerpc/dts-bindings/fsl/mpic.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt (renamed from Documentation/powerpc/dts-bindings/fsl/msi-pic.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/pmc.txt (renamed from Documentation/powerpc/dts-bindings/fsl/pmc.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/sec.txt (renamed from Documentation/powerpc/dts-bindings/fsl/sec.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/ssi.txt (renamed from Documentation/powerpc/dts-bindings/fsl/ssi.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/nintendo/gamecube.txt (renamed from Documentation/powerpc/dts-bindings/nintendo/gamecube.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/nintendo/wii.txt (renamed from Documentation/powerpc/dts-bindings/nintendo/wii.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/spi/fsl-spi.txt (renamed from Documentation/powerpc/dts-bindings/fsl/spi.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-bus.txt (renamed from Documentation/powerpc/dts-bindings/spi-bus.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/usb/fsl-usb.txt (renamed from Documentation/powerpc/dts-bindings/fsl/usb.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/usb/usb-ehci.txt (renamed from Documentation/powerpc/dts-bindings/usb-ehci.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/xilinx.txt (renamed from Documentation/powerpc/dts-bindings/xilinx.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/booting-without-of.txt (renamed from Documentation/powerpc/booting-without-of.txt) | 193 | ||||
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 35 | ||||
| -rw-r--r-- | Documentation/filesystems/Locking | 9 | ||||
| -rw-r--r-- | Documentation/filesystems/ntfs.txt | 2 | ||||
| -rw-r--r-- | Documentation/filesystems/porting | 8 | ||||
| -rw-r--r-- | Documentation/filesystems/proc.txt | 7 | ||||
| -rw-r--r-- | Documentation/filesystems/vfs.txt | 47 | ||||
| -rw-r--r-- | Documentation/gpio.txt | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/lm93 | 7 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 9 | ||||
| -rw-r--r-- | Documentation/lguest/lguest.c | 73 | ||||
| -rw-r--r-- | Documentation/lguest/lguest.txt | 5 | ||||
| -rw-r--r-- | Documentation/networking/bonding.txt | 83 | ||||
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 2 | ||||
| -rw-r--r-- | Documentation/scheduler/sched-stats.txt | 33 | ||||
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 1 | ||||
| -rw-r--r-- | Documentation/sound/alsa/soc/codec.txt | 45 | ||||
| -rw-r--r-- | Documentation/sound/alsa/soc/machine.txt | 38 | ||||
| -rw-r--r-- | Documentation/sound/alsa/soc/platform.txt | 12 | ||||
| -rwxr-xr-x | Documentation/target/tcm_mod_builder.py | 1094 | ||||
| -rw-r--r-- | Documentation/target/tcm_mod_builder.txt | 145 | ||||
| -rw-r--r-- | Documentation/thermal/sysfs-api.txt | 12 | ||||
| -rw-r--r-- | Documentation/video4linux/v4l2-controls.txt | 12 | ||||
| -rw-r--r-- | Documentation/vm/transhuge.txt | 298 | ||||
| -rw-r--r-- | MAINTAINERS | 149 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | arch/alpha/Kconfig | 16 | ||||
| -rw-r--r-- | arch/alpha/include/asm/io.h | 8 | ||||
| -rw-r--r-- | arch/alpha/include/asm/mman.h | 3 | ||||
| -rw-r--r-- | arch/alpha/kernel/Makefile | 4 | ||||
| -rw-r--r-- | arch/alpha/kernel/irq.c | 31 | ||||
| -rw-r--r-- | arch/alpha/kernel/irq_alpha.c | 24 | ||||
| -rw-r--r-- | arch/alpha/kernel/irq_i8259.c | 26 | ||||
| -rw-r--r-- | arch/alpha/kernel/irq_pyxis.c | 27 | ||||
| -rw-r--r-- | arch/alpha/kernel/irq_srm.c | 27 | ||||
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 3 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_alcor.c | 27 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_cabriolet.c | 28 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_dp264.c | 50 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_eb64p.c | 27 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_eiger.c | 27 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_jensen.c | 55 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_marvel.c | 50 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_mikasa.c | 27 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_noritake.c | 27 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_rawhide.c | 27 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_rx164.c | 27 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_sable.c | 28 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_takara.c | 27 |