Linux 3.13
Conflicts:
include/net/xfrm.h
Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.
| -rw-r--r-- | Documentation/ABI/README | 13 | |
| -rw-r--r-- | Documentation/ABI/stable/sysfs-driver-ib_srp | 13 | |
| -rw-r--r-- | Documentation/ABI/stable/sysfs-transport-srp | 39 | |
| -rw-r--r-- | Documentation/ABI/testing/configfs-usb-gadget-mass-storage | 31 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio | 71 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-mic.txt | 157 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-mtd | 2 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-net-batman-adv | 4 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-net-mesh | 34 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-powercap | 152 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-hid-roccat-ryos | 178 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-hid-wiimote | 18 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-sunxi-sid | 22 | |
| -rw-r--r-- | Documentation/Changes | 11 | |
| -rw-r--r-- | Documentation/DMA-API-HOWTO.txt | 37 | |
| -rw-r--r-- | Documentation/DMA-API.txt | 8 | |
| -rw-r--r-- | Documentation/DMA-attributes.txt | 6 | |
| -rw-r--r-- | Documentation/DocBook/80211.tmpl | 4 | |
| -rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 7 | |
| -rw-r--r-- | Documentation/DocBook/filesystems.tmpl | 1 | |
| -rw-r--r-- | Documentation/DocBook/genericirq.tmpl | 64 | |
| -rw-r--r-- | Documentation/DocBook/kernel-locking.tmpl | 2 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 8 | |
| -rw-r--r-- | Documentation/DocBook/mtdnand.tmpl | 2 | |
| -rw-r--r-- | Documentation/PCI/pci.txt | 8 | |
| -rw-r--r-- | Documentation/RCU/checklist.txt | 4 | |
| -rw-r--r-- | Documentation/RCU/stallwarn.txt | 22 | |
| -rw-r--r-- | Documentation/acpi/enumeration.txt | 26 | |
| -rw-r--r-- | Documentation/arm/Marvell/README | 1 | |
| -rw-r--r-- | Documentation/arm/sunxi/README | 26 | |
| -rw-r--r-- | Documentation/arm64/booting.txt | 45 | |
| -rw-r--r-- | Documentation/arm64/memory.txt | 29 | |
| -rw-r--r-- | Documentation/assoc_array.txt | 574 | |
| -rw-r--r-- | Documentation/backlight/lp855x-driver.txt | 5 | |
| -rw-r--r-- | Documentation/block/null_blk.txt | 72 | |
| -rw-r--r-- | Documentation/blockdev/floppy.txt | 6 | |
| -rw-r--r-- | Documentation/cgroups/memory.txt | 10 | |
| -rw-r--r-- | Documentation/cpu-freq/cpu-drivers.txt | 27 | |
| -rw-r--r-- | Documentation/cpu-freq/governors.txt | 4 | |
| -rw-r--r-- | Documentation/cpu-hotplug.txt | 2 | |
| -rw-r--r-- | Documentation/cpuidle/governor.txt | 1 | |
| -rw-r--r-- | Documentation/device-mapper/cache-policies.txt | 6 | |
| -rw-r--r-- | Documentation/device-mapper/cache.txt | 59 | |
| -rw-r--r-- | Documentation/device-mapper/dm-crypt.txt | 11 | |
| -rw-r--r-- | Documentation/devices.txt | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arc/pmu.txt | 24 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/arm-boards | 50 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/atmel-adc.txt | 8 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/cci.txt | 60 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/cpus.txt | 401 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/omap/mpu.txt | 8 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/omap/omap.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/pmu.txt | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/topology.txt | 474 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/vic.txt | 12 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/efm32-clock.txt | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/exynos4-clock.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/exynos5250-clock.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/exynos5420-clock.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/exynos5440-clock.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/imx6q-clock.txt | 5 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/keystone-gate.txt | 29 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/keystone-pll.txt | 84 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt | 19 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt | 14 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi/sun4i-a10-gates.txt | 93 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi/sun5i-a10s-gates.txt | 75 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi/sun5i-a13-gates.txt | 58 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi/sun6i-a31-gates.txt | 83 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi/sun7i-a20-gates.txt | 98 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/xgene.txt | 111 | |
| -rw-r--r-- | Documentation/devicetree/bindings/crypto/omap-aes.txt | 31 | |
| -rw-r--r-- | Documentation/devicetree/bindings/crypto/omap-des.txt | 30 | |
| -rw-r--r-- | Documentation/devicetree/bindings/crypto/omap-sham.txt | 28 | |
| -rw-r--r-- | Documentation/devicetree/bindings/dma/atmel-dma.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/8xxx_gpio.txt | 66 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/abilis,tb10x-gpio.txt | 36 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt | 52 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-pcf857x.txt | 71 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio.txt | 40 | |
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/lm90.txt | 44 | |
| -rw-r--r-- | Documentation/devicetree/bindings/hwrng/omap_rng.txt | 22 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt | 35 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-exynos5.txt | 44 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-omap.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 23 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-st.txt | 41 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/trivial-devices.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/light/cm36651.txt | 26 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/light/gp2ap020a00f.txt | 21 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | 29 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt | 89 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt | 55 | |
| -rw-r--r-- | Documentation/devicetree/bindings/leds/leds-lp55xx.txt | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/media/st-rc.txt | 29 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/as3722.txt | 194 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/s2mps11.txt | 13 | |
| -rw-r--r-- | Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt | 17 | |
| -rw-r--r-- | Documentation/devicetree/bindings/misc/ti,dac7512.txt | 20 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | 5 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt | 26 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/ti-omap.txt | 54 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/gpmc-nand.txt | 16 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/cpsw-phy-sel.txt | 28 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/davinci_emac.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/fsl-fec.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/smsc-lan91c111.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/designware-pcie.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/mvebu-pci.txt | 10 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/phy-bindings.txt | 66 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/samsung-phy.txt | 22 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/abilis,tb10x-iomux.txt | 80 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt | 37 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt | 99 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/fsl,mxs-pinctrl.txt | 859 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt | 46 | |
| -rw-r--r-- | Documentation/devicetree/bindings/power/twl-charger.txt | 20 | |
| -rw-r--r-- | Documentation/devicetree/bindings/power_supply/ti,bq24735.txt | 32 | |
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/dma.txt | 138 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/pwm-samsung.txt | 2 | |
