Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | Documentation/00-INDEX | 6 | |
| -rw-r--r-- | Documentation/ABI/obsolete/proc-pid-oom_adj | 22 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-block | 14 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-fcoe | 12 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-rbd | 18 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-firmware_node | 17 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-fs-ext4 | 13 | |
| -rw-r--r-- | Documentation/CodingStyle | 10 | |
| -rw-r--r-- | Documentation/DocBook/media/Makefile | 78 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/audio.xml | 113 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/ca.xml | 353 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/demux.xml | 230 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/dvbapi.xml | 4 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/dvbproperty.xml | 113 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/frontend.xml | 71 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/intro.xml | 2 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/kdapi.xml | 2 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/net.xml | 127 | |
| -rw-r--r-- | Documentation/DocBook/media/dvb/video.xml | 333 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/biblio.xml | 52 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/common.xml | 30 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/compat.xml | 43 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/controls.xml | 892 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/dev-osd.xml | 7 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/dev-rds.xml | 2 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/dev-subdev.xml | 20 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/gen-errors.xml | 19 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/io.xml | 27 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-nv12m.xml | 17 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml | 3 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml | 154 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt.xml | 39 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/selection-api.xml | 22 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/subdev-formats.xml | 44 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/v4l2.xml | 15 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-cropcap.xml | 12 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml | 7 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml | 7 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml | 6 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml | 6 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml | 9 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml | 7 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enuminput.xml | 2 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enumoutput.xml | 2 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enumstd.xml | 6 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-crop.xml | 6 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml | 9 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml | 13 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml | 7 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-fmt.xml | 13 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-parm.xml | 4 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-selection.xml | 9 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-std.xml | 10 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 6 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 5 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml | 9 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml | 6 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-querybuf.xml | 11 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-querycap.xml | 10 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-querystd.xml | 8 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-reqbufs.xml | 5 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml | 10 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-streamon.xml | 7 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-subdev-g-edid.xml | 152 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml | 8 | |
| -rw-r--r-- | Documentation/DocBook/media_api.tmpl | 9 | |
| -rw-r--r-- | Documentation/DocBook/mtdnand.tmpl | 2 | |
| -rw-r--r-- | Documentation/DocBook/networking.tmpl | 4 | |
| -rw-r--r-- | Documentation/IPMI.txt | 65 | |
| -rw-r--r-- | Documentation/aoe/aoe.txt | 58 | |
| -rw-r--r-- | Documentation/aoe/mkdevs.sh | 41 | |
| -rw-r--r-- | Documentation/aoe/mkshelf.sh | 28 | |
| -rw-r--r-- | Documentation/aoe/status.sh | 3 | |
| -rw-r--r-- | Documentation/arm/Booting | 22 | |
| -rw-r--r-- | Documentation/block/biodoc.txt | 5 | |
| -rw-r--r-- | Documentation/cgroups/memory.txt | 90 | |
| -rw-r--r-- | Documentation/crypto/asymmetric-keys.txt | 312 | |
| -rw-r--r-- | Documentation/device-mapper/dm-raid.txt | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/arm-boards | 12 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/atmel-at91.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/davinci/nand.txt | 51 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt | 31 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/xen.txt | 25 | |
| -rw-r--r-- | Documentation/devicetree/bindings/crypto/fsl-sec4.txt | 51 | |
| -rw-r--r-- | Documentation/devicetree/bindings/crypto/mv_cesa.txt | 20 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-fan.txt | 25 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-mvebu.txt | 53 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/atmel-i2c.txt | 30 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/davinci.txt | 28 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/nomadik.txt | 23 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/88pm860x.txt | 85 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/syscon.txt | 20 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/tps65910.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/twl4030-audio.txt | 46 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/twl6040.txt | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/misc/ifm-csi.txt | 41 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/atmel-hsmci.txt | 68 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt | 87 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/mmc.txt | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/pxa-mmc.txt | 25 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/samsung-sdhci.txt | 53 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/sdhci-dove.txt | 14 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/sdhci-spear.txt | 18 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt | 79 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/atmel-nand.txt | 40 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/gpmi-nand.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt | 50 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt | 52 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/mtd-physmap.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt | 83 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt | 97 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt | 95 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 100 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt | 72 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 279 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt | 46 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/powerpc/fsl/ifc.txt | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/imx-pwm.txt | 17 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 2 | |
| -rw-r--r-- | |
