--- /dev/null
+$ date
+Monday 8 October 09:34:25 EST 2012
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
+Merging origin/master (d8dc91b Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux)
+$ git merge origin/master
+Updating ecefbd9..d8dc91b
+Fast-forward
+ Documentation/ABI/testing/sysfs-bus-rbd | 18 +-
+ .../ABI/testing/sysfs-devices-firmware_node | 17 +
+ Documentation/ABI/testing/sysfs-fs-ext4 | 13 +
+ Documentation/CodingStyle | 10 +
+ Documentation/DocBook/media/Makefile | 2 +-
+ Documentation/DocBook/media/dvb/audio.xml | 113 +-
+ Documentation/DocBook/media/dvb/ca.xml | 353 ++
+ Documentation/DocBook/media/dvb/demux.xml | 230 +-
+ Documentation/DocBook/media/dvb/dvbapi.xml | 4 +-
+ Documentation/DocBook/media/dvb/dvbproperty.xml | 113 +-
+ Documentation/DocBook/media/dvb/frontend.xml | 71 +-
+ Documentation/DocBook/media/dvb/intro.xml | 2 +-
+ Documentation/DocBook/media/dvb/kdapi.xml | 2 +-
+ Documentation/DocBook/media/dvb/net.xml | 127 +
+ Documentation/DocBook/media/dvb/video.xml | 333 +-
+ Documentation/DocBook/media/v4l/biblio.xml | 52 +-
+ Documentation/DocBook/media/v4l/common.xml | 30 +-
+ Documentation/DocBook/media/v4l/compat.xml | 41 +-
+ Documentation/DocBook/media/v4l/controls.xml | 614 +--
+ Documentation/DocBook/media/v4l/dev-osd.xml | 7 -
+ Documentation/DocBook/media/v4l/dev-rds.xml | 2 +-
+ Documentation/DocBook/media/v4l/dev-subdev.xml | 20 +-
+ Documentation/DocBook/media/v4l/gen-errors.xml | 19 +-
+ Documentation/DocBook/media/v4l/io.xml | 21 +-
+ .../DocBook/media/v4l/pixfmt-srggb10dpcm8.xml | 3 +-
+ Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml | 154 +
+ Documentation/DocBook/media/v4l/pixfmt.xml | 1 +
+ Documentation/DocBook/media/v4l/selection-api.xml | 22 +-
+ Documentation/DocBook/media/v4l/v4l2.xml | 15 +-
+ Documentation/DocBook/media/v4l/vidioc-cropcap.xml | 12 +-
+ .../DocBook/media/v4l/vidioc-decoder-cmd.xml | 7 -
+ .../DocBook/media/v4l/vidioc-encoder-cmd.xml | 7 -
+ .../DocBook/media/v4l/vidioc-enum-dv-presets.xml | 6 +
+ .../DocBook/media/v4l/vidioc-enum-dv-timings.xml | 6 +
+ .../DocBook/media/v4l/vidioc-enum-fmt.xml | 9 +-
+ .../DocBook/media/v4l/vidioc-enum-framesizes.xml | 7 -
+ .../DocBook/media/v4l/vidioc-enuminput.xml | 2 +-
+ .../DocBook/media/v4l/vidioc-enumoutput.xml | 2 +-
+ Documentation/DocBook/media/v4l/vidioc-enumstd.xml | 6 +
+ Documentation/DocBook/media/v4l/vidioc-g-crop.xml | 6 +-
+ .../DocBook/media/v4l/vidioc-g-dv-preset.xml | 9 +-
+ .../DocBook/media/v4l/vidioc-g-dv-timings.xml | 13 +-
+ .../DocBook/media/v4l/vidioc-g-enc-index.xml | 7 -
+ Documentation/DocBook/media/v4l/vidioc-g-fmt.xml | 13 +-
+ Documentation/DocBook/media/v4l/vidioc-g-parm.xml | 4 +-
+ .../DocBook/media/v4l/vidioc-g-selection.xml | 9 +-
+ Documentation/DocBook/media/v4l/vidioc-g-std.xml | 10 +-
+ Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 6 +
+ Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 2 +
+ .../DocBook/media/v4l/vidioc-query-dv-preset.xml | 9 +
+ .../DocBook/media/v4l/vidioc-query-dv-timings.xml | 6 +
+ .../DocBook/media/v4l/vidioc-querycap.xml | 10 +-
+ .../DocBook/media/v4l/vidioc-querystd.xml | 8 +
+ Documentation/DocBook/media/v4l/vidioc-reqbufs.xml | 5 +-
+ .../DocBook/media/v4l/vidioc-s-hw-freq-seek.xml | 10 +
+ .../DocBook/media/v4l/vidioc-streamon.xml | 7 +-
+ .../DocBook/media/v4l/vidioc-subdev-g-edid.xml | 152 +
+ .../media/v4l/vidioc-subdev-g-selection.xml | 8 +-
+ Documentation/DocBook/media_api.tmpl | 9 +-
+ Documentation/aoe/aoe.txt | 58 +-
+ Documentation/aoe/mkdevs.sh | 41 -
+ Documentation/aoe/mkshelf.sh | 28 -
+ Documentation/aoe/status.sh | 3 +
+ Documentation/devicetree/bindings/arm/arm-boards | 12 +
+ .../devicetree/bindings/arm/versatile-fpga-irq.txt | 31 +
+ Documentation/devicetree/bindings/arm/xen.txt | 25 +
+ .../devicetree/bindings/crypto/fsl-sec4.txt | 51 +
+ .../devicetree/bindings/crypto/mv_cesa.txt | 20 +
+ .../devicetree/bindings/gpio/gpio-fan.txt | 25 +
+ .../devicetree/bindings/gpio/gpio-mvebu.txt | 53 +
+ Documentation/devicetree/bindings/mfd/88pm860x.txt | 85 +
+ Documentation/devicetree/bindings/mfd/syscon.txt | 20 +
+ Documentation/devicetree/bindings/mfd/tps65910.txt | 4 +
+ .../devicetree/bindings/mfd/twl4030-audio.txt | 46 +
+ Documentation/devicetree/bindings/mfd/twl6040.txt | 9 +-
+ Documentation/devicetree/bindings/misc/ifm-csi.txt | 41 +
+ .../pinctrl/marvell,armada-370-pinctrl.txt | 95 +
+ .../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 100 +
+ .../bindings/pinctrl/marvell,dove-pinctrl.txt | 72 +
+ .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 279 ++
+ .../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 46 +
+ .../devicetree/bindings/powerpc/fsl/ifc.txt | 9 +-
+ .../devicetree/bindings/regulator/88pm860x.txt | 30 +
+ .../devicetree/bindings/regulator/max8907.txt | 69 +
+ .../devicetree/bindings/regulator/tps6586x.txt | 6 +
+ Documentation/devicetree/bindings/rtc/snvs-rtc.txt | 1 +
+ .../bindings/video/backlight/88pm860x.txt | 15 +
+ Documentation/dvb/README.dvb-usb | 2 +-
+ Documentation/dvb/get_dvb_firmware | 2 +-
+ Documentation/filesystems/ext4.txt | 10 +
+ Documentation/i2c/busses/i2c-viapro | 6 +-
+ Documentation/i2c/muxes/i2c-mux-gpio | 18 +
+ Documentation/ioctl/ioctl-number.txt | 5 -
+ Documentation/power/power_supply_class.txt | 7 +
+ Documentation/printk-formats.txt | 1 +
+ Documentation/ramoops.txt | 4 +-
+ Documentation/rtc.txt | 5 +-
+ Documentation/smsc_ece1099.txt | 56 +
+ Documentation/sysctl/kernel.txt | 2 +
+ Documentation/video4linux/CARDLIST.cx23885 | 1 +
+ Documentation/video4linux/CQcam.txt | 2 +-
+ Documentation/video4linux/README.davinci-vpbe | 20 +-
+ Documentation/video4linux/fimc.txt | 16 +-
+ Documentation/video4linux/omap3isp.txt | 2 +-
+ Documentation/video4linux/v4l2-controls.txt | 6 +-
+ Documentation/video4linux/v4l2-framework.txt | 12 +-
+ Documentation/video4linux/videobuf | 2 +-
+ MAINTAINERS | 447 ++-
+ arch/arm/Kconfig | 62 +-
+ arch/arm/Makefile | 10 +-
+ arch/arm/boot/compressed/decompress.c | 3 +
+ arch/arm/boot/dts/Makefile | 9 +-
+ arch/arm/boot/dts/armada-370-xp.dtsi | 5 +
+ arch/arm/boot/dts/armada-370.dtsi | 44 +
+ arch/arm/boot/dts/armada-xp-db.dts | 4 +-
+ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 57 +
+ arch/arm/boot/dts/armada-xp-mv78260.dtsi | 70 +
+ arch/arm/boot/dts/armada-xp-mv78460.dtsi | 70 +
+ arch/arm/boot/dts/dove-cm-a510.dts | 38 +
+ arch/arm/boot/dts/dove-cubox.dts | 42 +
+ arch/arm/boot/dts/dove-dove-db.dts | 38 +
+ arch/arm/boot/dts/dove.dtsi | 143 +
+ arch/arm/boot/dts/imx6q.dtsi | 9 +-
+ arch/arm/boot/dts/integrator.dtsi | 76 +
+ arch/arm/boot/dts/integratorap.dts | 68 +
+ arch/arm/boot/dts/integratorcp.dts | 110 +
+ arch/arm/boot/dts/kirkwood-dnskw.dtsi | 10 +
+ arch/arm/boot/dts/kirkwood-dockstar.dts | 57 +
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 50 +-
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 105 +
+ arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 29 +
+ arch/arm/boot/dts/kirkwood.dtsi | 12 +-
+ arch/arm/boot/dts/pxa910-dkb.dts | 137 +
+ arch/arm/boot/dts/pxa910.dtsi | 4 +
+ arch/arm/boot/dts/xenvm-4.2.dts | 68 +
+ arch/arm/configs/imx_v6_v7_defconfig | 4 +-
+ arch/arm/configs/kirkwood_defconfig | 38 +-
+ arch/arm/configs/lpc32xx_defconfig | 7 +-
+ arch/arm/configs/marzen_defconfig | 15 +-
+ arch/arm/configs/mvebu_defconfig | 2 +
+ arch/arm/configs/mxs_defconfig | 36 +-
+ arch/arm/configs/s3c6400_defconfig | 3 +
+ arch/arm/configs/tegra_defconfig | 51 +-
+ arch/arm/include/asm/Kbuild | 17 +
+ arch/arm/include/asm/arch_timer.h | 8 +-
+ arch/arm/include/asm/current.h | 15 -
+ arch/arm/include/asm/delay.h | 9 +
+ arch/arm/include/asm/exec.h | 6 -
+ arch/arm/include/asm/glue-cache.h | 16 +-
+ arch/arm/include/asm/hardirq.h | 2 +-
+ arch/arm/include/asm/hardware/linkup-l1110.h | 48 -
+ arch/arm/include/asm/hypervisor.h | 6 +
+ arch/arm/include/asm/io.h | 67 +-
+ arch/arm/include/asm/ipcbuf.h | 1 -
+ arch/arm/include/asm/msgbuf.h | 31 -
+ arch/arm/include/asm/mutex.h | 9 +-
+ arch/arm/include/asm/opcodes-virt.h | 29 +
+ arch/arm/include/asm/opcodes.h | 181 +-
+ arch/arm/include/asm/param.h | 31 -
+ arch/arm/include/asm/parport.h | 18 -
+ arch/arm/include/asm/segment.h | 11 -
+ arch/arm/include/asm/sembuf.h | 25 -
+ arch/arm/include/asm/serial.h | 19 -
+ arch/arm/include/asm/shmbuf.h | 42 -
+ arch/arm/include/asm/socket.h | 72 -
+ arch/arm/include/asm/sockios.h | 13 -
+ arch/arm/include/asm/sync_bitops.h | 27 +
+ arch/arm/include/asm/syscall.h | 5 +
+ arch/arm/include/asm/termbits.h | 198 -
+ arch/arm/include/asm/termios.h | 92 -
+ arch/arm/include/asm/thread_info.h | 6 +-
+ arch/arm/include/asm/timex.h | 6 -
+ arch/arm/include/asm/types.h | 16 -
+ arch/arm/include/asm/unaligned.h | 19 -
+ arch/arm/include/asm/unistd.h | 8 +
+ arch/arm/include/asm/xen/events.h | 18 +
+ arch/arm/include/asm/xen/hypercall.h | 69 +
+ arch/arm/include/asm/xen/hypervisor.h | 19 +
+ arch/arm/include/asm/xen/interface.h | 73 +
+ arch/arm/include/asm/xen/page.h | 82 +
+ arch/arm/kernel/Makefile | 5 +-
+ arch/arm/kernel/arch_timer.c | 383 +-
+ arch/arm/kernel/asm-offsets.c | 2 +
+ arch/arm/kernel/atags.h | 14 +
+ arch/arm/kernel/{compat.c => atags_compat.c} | 4 +-
+ arch/arm/kernel/atags_parse.c | 238 ++
+ arch/arm/kernel/{atags.c => atags_proc.c} | 0
+ arch/arm/kernel/compat.h | 11 -
+ arch/arm/kernel/entry-common.S | 9 +
+ arch/arm/kernel/machine_kexec.c | 29 +-
+ arch/arm/kernel/ptrace.c | 19 +-
+ arch/arm/kernel/sched_clock.c | 8 +
+ arch/arm/kernel/setup.c | 236 +-
+ arch/arm/kernel/smp.c | 13 +-
+ arch/arm/lib/delay.c | 35 +-
+ arch/arm/mach-at91/clock.c | 2 +-
+ arch/arm/mach-davinci/board-tnetv107x-evm.c | 6 +-
+ arch/arm/mach-davinci/da830.c | 48 +-
+ arch/arm/mach-davinci/da850.c | 6 +-
+ arch/arm/mach-dove/Kconfig | 7 +
+ arch/arm/mach-dove/Makefile | 4 +-
+ arch/arm/mach-dove/common.c | 157 +-
+ arch/arm/mach-dove/common.h | 4 +
+ arch/arm/mach-dove/include/mach/bridge-regs.h | 16 +-
+ arch/arm/mach-dove/include/mach/dove.h | 126 +-
+ arch/arm/mach-dove/include/mach/pm.h | 54 +-
+ arch/arm/mach-dove/irq.c | 10 +-
+ arch/arm/mach-dove/pcie.c | 6 +-
+ arch/arm/mach-exynos/platsmp.c | 2 +-
+ arch/arm/mach-imx/Kconfig | 2 +-
+ arch/arm/mach-imx/clk-imx27.c | 4 +-
+ arch/arm/mach-imx/devices-imx27.h | 4 +
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 49 +-
+ arch/arm/mach-imx/mach-imx6q.c | 47 +-
+ arch/arm/mach-integrator/common.h | 3 +
+ arch/arm/mach-integrator/core.c | 17 +-
+ arch/arm/mach-integrator/integrator_ap.c | 276 +-
+ arch/arm/mach-integrator/integrator_cp.c | 325 +-
+ arch/arm/mach-kirkwood/Kconfig | 21 +
+ arch/arm/mach-kirkwood/Makefile | 3 +
+ arch/arm/mach-kirkwood/addr-map.c | 3 +-
+ arch/arm/mach-kirkwood/board-dnskw.c | 35 -
+ arch/arm/mach-kirkwood/board-dockstar.c | 61 +
+ arch/arm/mach-kirkwood/board-dt.c | 14 +-
+ arch/arm/mach-kirkwood/board-iconnect.c | 48 -
+ arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 57 +
+ arch/arm/mach-kirkwood/board-km_kirkwood.c | 57 +
+ arch/arm/mach-kirkwood/common.c | 8 +-
+ arch/arm/mach-kirkwood/common.h | 18 +
+ arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 20 +-
+ arch/arm/mach-kirkwood/include/mach/kirkwood.h | 112 +-
+ arch/arm/mach-kirkwood/irq.c | 9 +-
+ arch/arm/mach-kirkwood/pcie.c | 12 +-
+ arch/arm/mach-kirkwood/ts41x-setup.c | 3 +-
+ arch/arm/mach-msm/board-qsd8x50.c | 4 +-
+ arch/arm/mach-mv78xx0/addr-map.c | 6 +-
+ arch/arm/mach-mv78xx0/common.c | 4 +-
+ arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | 12 +-
+ arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 86 +-
+ arch/arm/mach-mv78xx0/irq.c | 9 +-
+ arch/arm/mach-mv78xx0/pcie.c | 12 +-
+ arch/arm/mach-mvebu/Kconfig | 20 +-
+ arch/arm/mach-mvebu/Makefile | 5 +-
+ arch/arm/mach-mvebu/addr-map.c | 134 +
+ arch/arm/mach-mvebu/armada-370-xp.c | 2 +-
+ arch/arm/mach-mvebu/armada-370-xp.h | 2 +-
+ arch/arm/mach-mvebu/include/mach/gpio.h | 1 +
+ arch/arm/mach-omap1/devices.c | 28 +
+ arch/arm/mach-omap1/timer.c | 2 +-
+ arch/arm/mach-omap2/Makefile | 1 +
+ arch/arm/mach-omap2/board-apollon.c | 4 +-
+ arch/arm/mach-omap2/board-h4.c | 6 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 2 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 30 +
+ arch/arm/mach-omap2/clkt2xxx_apll.c | 2 +-
+ arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 10 +-
+ arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 20 +-
+ arch/arm/mach-omap2/clkt_clksel.c | 86 +-
+ arch/arm/mach-omap2/clkt_dpll.c | 26 +-
+ arch/arm/mach-omap2/clock.c | 9 +-
+ arch/arm/mach-omap2/clock2420_data.c | 24 +-
+ arch/arm/mach-omap2/clock2430_data.c | 23 +
+ arch/arm/mach-omap2/clock33xx_data.c | 1 +
+ arch/arm/mach-omap2/clock3xxx.c | 8 +-
+ arch/arm/mach-omap2/clock3xxx_data.c | 37 +-
+ arch/arm/mach-omap2/clock44xx_data.c | 21 +
+ arch/arm/mach-omap2/clockdomain.c | 17 +
+ arch/arm/mach-omap2/clockdomain.h | 20 +-
+ arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 49 +-
+ arch/arm/mach-omap2/clockdomain44xx.c | 11 +
+ arch/arm/mach-omap2/clockdomains3xxx_data.c | 7 +-
+ arch/arm/mach-omap2/clockdomains44xx_data.c | 3 +-
+ arch/arm/mach-omap2/cm-regbits-33xx.h | 158 +-
+ arch/arm/mach-omap2/cm-regbits-34xx.h | 2 +
+ arch/arm/mach-omap2/cm-regbits-44xx.h | 411 +-
+ arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 +-
+ arch/arm/mach-omap2/cm2xxx_3xxx.h | 1 +
+ arch/arm/mach-omap2/control.h | 1 +
+ arch/arm/mach-omap2/devices.c | 39 +-
+ arch/arm/mach-omap2/display.c | 10 +-
+ arch/arm/mach-omap2/dpll3xxx.c | 48 +-
+ arch/arm/mach-omap2/gpmc.c | 194 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 138 +-
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 19 +
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 19 +
+ .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 17 +
+ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 110 +-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 280 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 243 +-
+ arch/arm/mach-omap2/omap_hwmod_common_data.h | 6 +-
+ arch/arm/mach-omap2/pm.c | 5 +-
+ arch/arm/mach-omap2/pmu.c | 95 +
+ arch/arm/mach-omap2/powerdomain44xx.c | 61 +-
+ arch/arm/mach-omap2/prcm-common.h | 2 +
+ arch/arm/mach-omap2/usb-host.c | 31 +-
+ arch/arm/mach-orion5x/addr-map.c | 3 +-
+ arch/arm/mach-orion5x/common.c | 4 +-
+ arch/arm/mach-orion5x/dns323-setup.c | 2 +-
+ arch/arm/mach-orion5x/include/mach/bridge-regs.h | 20 +-
+ arch/arm/mach-orion5x/include/mach/orion5x.h | 56 +-
+ arch/arm/mach-orion5x/irq.c | 5 +-
+ arch/arm/mach-orion5x/pci.c | 6 +-
+ arch/arm/mach-sa1100/include/mach/SA-1111.h | 5 -
+ arch/arm/mach-sa1100/include/mach/lart.h | 13 -
+ arch/arm/mach-shmobile/smp-emev2.c | 2 +-
+ arch/arm/mach-tegra/include/mach/smmu.h | 63 -
+ arch/arm/mach-u300/i2c.c | 2 +-
+ arch/arm/mach-vexpress/v2m.c | 1 +
+ arch/arm/mm/alignment.c | 6 +-
+ arch/arm/mm/cache-l2x0.c | 8 +-
+ arch/arm/mm/cache-v7.S | 3 +
+ arch/arm/mm/init.c | 2 +-
+ arch/arm/mm/ioremap.c | 1 +
+ arch/arm/plat-mxc/devices/Kconfig | 6 +-
+ arch/arm/plat-mxc/devices/Makefile | 1 +
+ arch/arm/plat-mxc/devices/platform-imx27-coda.c | 37 +
+ arch/arm/plat-mxc/include/mach/devices-common.h | 8 +
+ arch/arm/plat-omap/clock.c | 27 -
+ arch/arm/plat-omap/include/plat/clock.h | 5 +
+ arch/arm/plat-omap/include/plat/dmtimer.h | 1 +
+ arch/arm/plat-omap/include/plat/iommu.h | 15 +
+ arch/arm/plat-omap/include/plat/omap_device.h | 4 +
+ arch/arm/plat-omap/include/plat/omap_hwmod.h | 26 +-
+ arch/arm/plat-omap/include/plat/usb.h | 7 +
+ arch/arm/plat-omap/omap_device.c | 59 +-
+ arch/arm/plat-orion/Makefile | 10 +-
+ arch/arm/plat-orion/addr-map.c | 11 +-
+ arch/arm/plat-orion/common.c | 12 +-
+ arch/arm/plat-orion/include/plat/addr-map.h | 4 +-
+ arch/arm/plat-orion/include/plat/common.h | 8 +-
+ arch/arm/plat-orion/include/plat/mpp.h | 2 +-
+ arch/arm/plat-orion/include/plat/time.h | 4 +-
+ arch/arm/plat-orion/mpp.c | 6 +-
+ arch/arm/plat-orion/time.c | 8 +-
+ arch/arm/plat-versatile/fpga-irq.c | 72 +-
+ arch/arm/plat-versatile/include/plat/fpga-irq.h | 2 +
+ arch/arm/xen/Makefile | 1 +
+ arch/arm/xen/enlighten.c | 168 +
+ arch/arm/xen/grant-table.c | 53 +
+ arch/arm/xen/hypercall.S | 106 +
+ arch/arm64/include/asm/compat.h | 60 +-
+ arch/arm64/include/asm/hwcap.h | 4 +-
+ arch/arm64/include/asm/stat.h | 4 +-
+ arch/arm64/include/asm/unistd.h | 8 +-
+ arch/arm64/include/asm/unistd32.h | 4 -
+ arch/arm64/kernel/signal32.c | 53 -
+ arch/avr32/include/asm/elf.h | 3 +-
+ arch/blackfin/include/asm/elf.h | 3 +-
+ arch/c6x/Makefile | 2 +
+ arch/c6x/include/asm/Kbuild | 1 +
+ arch/c6x/include/asm/elf.h | 3 +-
+ arch/c6x/include/asm/signal.h | 17 -
+ arch/c6x/include/asm/unistd.h | 4 -
+ arch/cris/include/asm/elf.h | 3 +-
+ arch/frv/include/asm/elf.h | 3 +-
+ arch/frv/kernel/pm.c | 19 +-
+ arch/frv/kernel/setup.c | 2 +-
+ arch/frv/mb93090-mb00/pci-irq.c | 2 +-
+ arch/h8300/include/asm/elf.h | 3 +-
+ arch/h8300/kernel/sys_h8300.c | 1 +
+ arch/h8300/kernel/timer/itu.c | 2 +-
+ arch/h8300/kernel/timer/timer16.c | 2 +-
+ arch/h8300/kernel/timer/timer8.c | 2 +-
+ arch/h8300/kernel/timer/tpu.c | 2 +-
+ arch/h8300/platform/h8300h/irq.c | 4 +-
+ arch/h8300/platform/h8s/irq.c | 4 +-
+ arch/hexagon/include/asm/elf.h | 3 +-
+ arch/hexagon/include/asm/unistd.h | 5 -
+ arch/ia64/include/asm/xen/interface.h | 1 +
+ arch/ia64/xen/irq_xen.c | 2 +-
+ arch/ia64/xen/irq_xen.h | 2 +-
+ arch/m32r/include/asm/elf.h | 3 +-
+ arch/m68k/include/asm/cacheflush_no.h | 19 +-
+ arch/m68k/include/asm/elf.h | 3 +-
+ arch/m68k/include/asm/m5206sim.h | 98 +-
+ arch/m68k/include/asm/m523xsim.h | 24 +-
+ arch/m68k/include/asm/m5249sim.h | 98 +-
+ arch/m68k/include/asm/m525xsim.h | 70 +-
+ arch/m68k/include/asm/m5272sim.h | 99 +-
+ arch/m68k/include/asm/m527xsim.h | 84 +-
+ arch/m68k/include/asm/m528xsim.h | 51 +-
+ arch/m68k/include/asm/m5307sim.h | 136 +-
+ arch/m68k/include/asm/m532xsim.h | 1189 +-----
+ arch/m68k/include/asm/m5407sim.h | 110 +-
+ arch/m68k/include/asm/m54xxgpt.h | 40 +-
+ arch/m68k/include/asm/m54xxsim.h | 27 +-
+ arch/m68k/include/asm/mcfslt.h | 7 -
+ arch/m68k/include/asm/nettel.h | 9 +-
+ arch/m68k/platform/68VZ328/Makefile | 8 +-
+ arch/m68k/platform/coldfire/device.c | 4 +-
+ arch/m68k/platform/coldfire/head.S | 2 +-
+ arch/m68k/platform/coldfire/intc-5249.c | 10 +-
+ arch/m68k/platform/coldfire/intc-5272.c | 20 +-
+ arch/m68k/platform/coldfire/intc.c | 28 +-
+ arch/m68k/platform/coldfire/m523x.c | 8 +-
+ arch/m68k/platform/coldfire/m5249.c | 10 +-
+ arch/m68k/platform/coldfire/m525x.c | 4 +-
+ arch/m68k/platform/coldfire/m5272.c | 19 +-
+ arch/m68k/platform/coldfire/m527x.c | 24 +-
+ arch/m68k/platform/coldfire/m528x.c | 6 +-
+ arch/m68k/platform/coldfire/m532x.c | 221 +-
+ arch/m68k/platform/coldfire/m54xx.c | 16 +-
+ arch/m68k/platform/coldfire/nettel.c | 4 +-
+ arch/m68k/platform/coldfire/pci.c | 4 +-
+ arch/m68k/platform/coldfire/reset.c | 2 +-
+ arch/m68k/platform/coldfire/sltimers.c | 4 +-
+ arch/m68k/platform/coldfire/timers.c | 4 +-
+ arch/microblaze/Kconfig | 7 +-
+ arch/microblaze/include/asm/clinkage.h | 1 -
+ arch/microblaze/include/asm/elf.h | 3 +-
+ arch/microblaze/include/asm/io.h | 94 +
+ arch/microblaze/include/asm/page.h | 9 +-
+ arch/microblaze/include/asm/pci.h | 2 +
+ arch/microblaze/include/asm/pgtable.h | 6 -
+ arch/microblaze/kernel/head.S | 14 +-
+ arch/microblaze/kernel/hw_exception_handler.S | 61 +-
+ arch/microblaze/kernel/reset.c | 21 +-
+ arch/microblaze/kernel/setup.c | 15 +-
+ arch/microblaze/kernel/signal.c | 8 -
+ arch/microblaze/kernel/timer.c | 24 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 2 +-
+ arch/mips/include/asm/compat-signal.h | 62 -
+ arch/mips/include/asm/compat.h | 69 +-
+ arch/mips/pci/pci-octeon.c | 2 +-
+ arch/mn10300/Makefile | 2 +-
+ arch/mn10300/include/asm/elf.h | 3 +-
+ arch/openrisc/include/asm/elf.h | 3 +-
+ arch/openrisc/include/asm/unistd.h | 5 -
+ arch/parisc/Kconfig | 1 +
+ arch/parisc/include/asm/compat.h | 59 +-
+ arch/parisc/kernel/signal32.h | 52 -
+ arch/powerpc/Kconfig | 17 +-
+ arch/powerpc/boot/Makefile | 1 +
+ arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi | 58 +
+ arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi | 52 +
+ arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi | 59 +
+ arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 320 ++
+ arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi | 114 +
+ arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi | 118 +
+ arch/powerpc/boot/dts/mpc8536ds.dtsi | 4 +
+ arch/powerpc/boot/dts/mpc8540ads.dts | 2 +
+ arch/powerpc/boot/dts/mpc8541cds.dts | 2 +
+ arch/powerpc/boot/dts/mpc8544ds.dts | 4 +-
+ arch/powerpc/boot/dts/mpc8544ds.dtsi | 39 +
+ arch/powerpc/boot/dts/mpc8555cds.dts | 2 +
+ arch/powerpc/boot/dts/mpc8560ads.dts | 2 +
+ arch/powerpc/boot/dts/o2d.dts | 47 +
+ arch/powerpc/boot/dts/o2d.dtsi | 139 +
+ arch/powerpc/boot/dts/o2d300.dts | 52 +
+ arch/powerpc/boot/dts/o2dnt2.dts | 48 +
+ arch/powerpc/boot/dts/o2i.dts | 33 +
+ arch/powerpc/boot/dts/o2mnt.dts | 33 +
+ arch/powerpc/boot/dts/o3dnt.dts | 48 +
+ arch/powerpc/boot/dts/p1020rdb_camp_core0.dts | 63 -
+ arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 141 -
+ arch/powerpc/boot/dts/p1022ds.dtsi | 4 +
+ arch/powerpc/boot/dts/p1022rdk.dts | 188 +
+ arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 67 -
+ arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 125 -
+ arch/powerpc/boot/dts/p2041rdb.dts | 4 +
+ arch/powerpc/boot/dts/p3041ds.dts | 4 +
+ arch/powerpc/boot/dts/p4080ds.dts | 4 +
+ arch/powerpc/boot/dts/p5020ds.dts | 4 +
+ arch/powerpc/boot/dts/p5040ds.dts | 207 +
+ arch/powerpc/configs/85xx/p1023rds_defconfig | 6 +
+ arch/powerpc/configs/corenet32_smp_defconfig | 1 +
+ arch/powerpc/configs/corenet64_smp_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
+ arch/powerpc/configs/ppc64_defconfig | 1 +
+ arch/powerpc/configs/pseries_defconfig | 1 +
+ arch/powerpc/include/asm/abs_addr.h | 56 -
+ arch/powerpc/include/asm/bitops.h | 10 +
+ arch/powerpc/include/asm/cacheflush.h | 2 +
+ arch/powerpc/include/asm/compat.h | 60 +-
+ arch/powerpc/include/asm/debug.h | 2 +-
+ arch/powerpc/include/asm/eeh.h | 141 +-
+ arch/powerpc/include/asm/eeh_event.h | 6 +-
+ arch/powerpc/include/asm/exception-64e.h | 6 +-
+ arch/powerpc/include/asm/fsl_guts.h | 2 +
+ arch/powerpc/include/asm/fsl_ifc.h | 14 +-
+ arch/powerpc/include/asm/hvcall.h | 5 -
+ arch/powerpc/include/asm/hw_breakpoint.h | 9 +-
+ arch/powerpc/include/asm/kprobes.h | 15 +-
+ arch/powerpc/include/asm/kvm_book3s.h | 2 +-
+ arch/powerpc/include/asm/kvm_book3s_asm.h | 1 -
+ arch/powerpc/include/asm/machdep.h | 9 +-
+ arch/powerpc/include/asm/mmu-hash64.h | 169 +-
+ arch/powerpc/include/asm/mmu.h | 9 +
+ arch/powerpc/include/asm/mpc52xx.h | 2 +
+ arch/powerpc/include/asm/mpic.h | 19 +
+ arch/powerpc/include/asm/paca.h | 3 +-
+ arch/powerpc/include/asm/page_64.h | 10 +-
+ arch/powerpc/include/asm/pci-bridge.h | 11 +
+ arch/powerpc/include/asm/perf_event_server.h | 1 +
+ arch/powerpc/include/asm/pgtable-ppc64-4k.h | 4 +-
+ arch/powerpc/include/asm/pgtable-ppc64-64k.h | 2 +-
+ arch/powerpc/include/asm/pgtable-ppc64.h | 19 +-
+ arch/powerpc/include/asm/pgtable.h | 10 +-
+ arch/powerpc/include/asm/ppc-opcode.h | 3 +
+ arch/powerpc/include/asm/ppc-pci.h | 20 +-
+ arch/powerpc/include/asm/probes.h | 42 +
+ arch/powerpc/include/asm/processor.h | 6 +-
+ arch/powerpc/include/asm/pte-hash64-64k.h | 18 +-
+ arch/powerpc/include/asm/reg.h | 54 +-
+ arch/powerpc/include/asm/setup.h | 2 +-
+ arch/powerpc/include/asm/siginfo.h | 1 -
+ arch/powerpc/include/asm/smp.h | 2 +
+ arch/powerpc/include/asm/sparsemem.h | 4 +-
+ arch/powerpc/include/asm/swiotlb.h | 6 +
+ arch/powerpc/include/asm/thread_info.h | 7 +-
+ arch/powerpc/include/asm/tlbflush.h | 7 +-
+ arch/powerpc/include/asm/uaccess.h | 11 -
+ arch/powerpc/include/asm/uprobes.h | 54 +
+ arch/powerpc/kernel/Makefile | 1 +
+ arch/powerpc/kernel/asm-offsets.c | 2 +-
+ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 74 +-
+ arch/powerpc/kernel/cputable.c | 4 +
+ arch/powerpc/kernel/dma-swiotlb.c | 22 +-
+ arch/powerpc/kernel/dma.c | 3 +-
+ arch/powerpc/kernel/entry_32.S | 47 +-
+ arch/powerpc/kernel/entry_64.S | 35 +
+ arch/powerpc/kernel/exceptions-64e.S | 212 +-
+ arch/powerpc/kernel/exceptions-64s.S | 127 +-
+ arch/powerpc/kernel/fadump.c | 3 +-
+ arch/powerpc/kernel/head_fsl_booke.S | 46 +-
+ arch/powerpc/kernel/hw_breakpoint.c | 25 +-
+ arch/powerpc/kernel/ibmebus.c | 1 -
+ arch/powerpc/kernel/iommu.c | 5 +-
+ arch/powerpc/kernel/irq.c | 8 +-
+ arch/powerpc/kernel/machine_kexec.c | 14 +-
+ arch/powerpc/kernel/paca.c | 1 +
+ arch/powerpc/kernel/pci-common.c | 16 +-
+ arch/powerpc/kernel/ppc32.h | 51 -
+ arch/powerpc/kernel/process.c | 16 +-
+ arch/powerpc/kernel/prom.c | 4 +-
+ arch/powerpc/kernel/prom_init.c | 2 +-
+ arch/powerpc/kernel/ptrace.c | 3 +
+ arch/powerpc/kernel/rtas_flash.c | 7 +-
+ arch/powerpc/kernel/rtas_pci.c | 5 +-
+ arch/powerpc/kernel/setup_64.c | 2 +
+ arch/powerpc/kernel/signal.c | 8 +-
+ arch/powerpc/kernel/smp.c | 14 +-
+ arch/powerpc/kernel/time.c | 8 +-
+ arch/powerpc/kernel/traps.c | 1 +
+ arch/powerpc/kernel/uprobes.c | 184 +
+ arch/powerpc/kernel/vdso.c | 4 +-
+ arch/powerpc/kernel/vio.c | 1 -
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 8 +-
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 17 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +-
+ arch/powerpc/kvm/trace.h | 14 +-
+ arch/powerpc/lib/memcpy_power7.S | 4 +-
+ arch/powerpc/lib/sstep.c | 36 +-
+ arch/powerpc/mm/fault.c | 1 +
+ arch/powerpc/mm/hash_low_64.S | 97 +-
+ arch/powerpc/mm/hash_native_64.c | 192 +-
+ arch/powerpc/mm/hash_utils_64.c | 48 +-
+ arch/powerpc/mm/hugetlbpage-hash64.c | 15 +-
+ arch/powerpc/mm/init_64.c | 1 -
+ arch/powerpc/mm/mem.c | 5 +-
+ arch/powerpc/mm/mmu_context_hash64.c | 10 +-
+ arch/powerpc/mm/pgtable_64.c | 13 +-
+ arch/powerpc/mm/slb_low.S | 62 +-
+ arch/powerpc/mm/slice.c | 112 +-
+ arch/powerpc/mm/stab.c | 3 +-
+ arch/powerpc/mm/subpage-prot.c | 6 +-
+ arch/powerpc/mm/tlb_hash64.c | 11 +-
+ arch/powerpc/mm/tlb_low_64e.S | 18 +-
+ arch/powerpc/oprofile/op_model_power4.c | 116 +-
+ arch/powerpc/perf/core-book3s.c | 46 +-
+ arch/powerpc/perf/power7-pmu.c | 3 +
+ arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +-
+ arch/powerpc/platforms/44x/currituck.c | 10 +-
+ arch/powerpc/platforms/512x/Kconfig | 1 +
+ arch/powerpc/platforms/512x/clock.c | 6 +-
+ arch/powerpc/platforms/512x/mpc5121_generic.c | 2 +-
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 6 -
+ arch/powerpc/platforms/52xx/lite5200.c | 2 +-
+ arch/powerpc/platforms/52xx/media5200.c | 2 +-
+ arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 35 +-
+ arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +-
+ arch/powerpc/platforms/85xx/Kconfig | 21 +
+ arch/powerpc/platforms/85xx/Makefile | 2 +
+ arch/powerpc/platforms/85xx/common.c | 10 +
+ arch/powerpc/platforms/85xx/corenet_ds.c | 38 +-
+ arch/powerpc/platforms/85xx/ge_imp3a.c | 62 +-
+ arch/powerpc/platforms/85xx/mpc8536_ds.c | 36 +-
+ arch/powerpc/platforms/85xx/mpc85xx_ads.c | 11 +-
+ arch/powerpc/platforms/85xx/mpc85xx_cds.c | 44 +-
+ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 15 +-
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 40 +-
+ arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 30 +-
+ arch/powerpc/platforms/85xx/p1010rdb.c | 14 +-
+ arch/powerpc/platforms/85xx/p1022_ds.c | 36 +-
+ arch/powerpc/platforms/85xx/p1022_rdk.c | 167 +
+ arch/powerpc/platforms/85xx/p1023_rds.c | 9 +-
+ arch/powerpc/platforms/85xx/p2041_rdb.c | 2 +-
+ arch/powerpc/platforms/85xx/p3041_ds.c | 2 +-
+ arch/powerpc/platforms/85xx/p4080_ds.c | 2 +-
+ arch/powerpc/platforms/85xx/p5020_ds.c | 2 +-
+ arch/powerpc/platforms/85xx/p5040_ds.c | 89 +
+ arch/powerpc/platforms/85xx/qemu_e500.c | 5 +-
+ arch/powerpc/platforms/85xx/sbc8548.c | 21 +-
+ arch/powerpc/platforms/85xx/smp.c | 220 +-
+ arch/powerpc/platforms/85xx/socrates.c | 11 +-
+ arch/powerpc/platforms/85xx/stx_gp3.c | 13 +-
+ arch/powerpc/platforms/85xx/tqm85xx.c | 23 +-
+ arch/powerpc/platforms/85xx/xes_mpc85xx.c | 56 +-
+ arch/powerpc/platforms/86xx/gef_ppc9a.c | 12 +-
+ arch/powerpc/platforms/86xx/gef_sbc310.c | 13 +-
+ arch/powerpc/platforms/86xx/gef_sbc610.c | 12 +-
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 21 +-
+ arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 42 +-
+ arch/powerpc/platforms/86xx/sbc8641d.c | 14 +-
+ arch/powerpc/platforms/cell/beat.c | 4 +-
+ arch/powerpc/platforms/cell/beat.h | 2 +-
+ arch/powerpc/platforms/cell/beat_htab.c | 45 +-
+ arch/powerpc/platforms/pasemi/iommu.c | 6 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 695 +---
+ arch/powerpc/platforms/powernv/pci-p5ioc2.c | 1 -
+ arch/powerpc/platforms/powernv/pci.c | 7 +-
+ arch/powerpc/platforms/powernv/pci.h | 21 +-
+ arch/powerpc/platforms/ps3/htab.c | 22 +-
+ arch/powerpc/platforms/ps3/setup.c | 10 +-
+ arch/powerpc/platforms/pseries/Makefile | 5 +-
+ arch/powerpc/platforms/pseries/eeh.c | 543 +--
+ arch/powerpc/platforms/pseries/eeh_cache.c | 59 +-
+ arch/powerpc/platforms/pseries/eeh_dev.c | 14 +-
+ arch/powerpc/platforms/pseries/eeh_driver.c | 310 +-
+ arch/powerpc/platforms/pseries/eeh_event.c | 54 +-
+ arch/powerpc/platforms/pseries/eeh_pe.c | 652 +++
+ arch/powerpc/platforms/pseries/eeh_pseries.c | 247 +-
+ arch/powerpc/platforms/pseries/eeh_sysfs.c | 9 -
+ arch/powerpc/platforms/pseries/iommu.c | 12 +-
+ arch/powerpc/platforms/pseries/lpar.c | 77 +-
+ arch/powerpc/platforms/pseries/msi.c | 26 +-
+ arch/powerpc/platforms/pseries/pci.c | 2 +-
+ arch/powerpc/platforms/pseries/pci_dlpar.c | 32 +-
+ arch/powerpc/platforms/pseries/setup.c | 22 +-
+ arch/powerpc/sysdev/Makefile | 2 +-
+ arch/powerpc/sysdev/dart_iommu.c | 19 +-
+ arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 10 +
+ arch/powerpc/sysdev/fsl_ifc.c | 20 +-
+ arch/powerpc/sysdev/fsl_mpic_err.c | 149 +
+ arch/powerpc/sysdev/fsl_pci.c | 157 +-
+ arch/powerpc/sysdev/fsl_pci.h | 20 +-
+ arch/powerpc/sysdev/mpic.c | 102 +-
+ arch/powerpc/sysdev/mpic.h | 22 +
+ arch/powerpc/xmon/xmon.c | 111 +-
+ arch/s390/Kconfig | 1 -
+ arch/s390/include/asm/compat.h | 75 +-
+ arch/s390/kernel/compat_linux.h | 68 -
+ arch/score/Kconfig | 1 +
+ arch/score/include/asm/elf.h | 2 +-
+ arch/score/include/asm/unistd.h | 5 -
+ arch/score/kernel/sys_score.c | 1 +
+ arch/sh/include/asm/elf.h | 3 +-
+ arch/sh/include/asm/io.h | 2 +-
+ arch/sh/kernel/ioport.c | 2 +-
+ arch/sparc/include/asm/compat.h | 61 +-
+ arch/sparc/include/asm/elf_32.h | 3 +-
+ arch/sparc/include/asm/siginfo.h | 1 -
+ arch/sparc/kernel/signal32.c | 52 -
+ arch/tile/include/asm/compat.h | 62 +
+ arch/tile/include/asm/elf.h | 4 +-
+ arch/tile/include/asm/unistd.h | 5 -
+ arch/tile/kernel/compat_signal.c | 57 -
+ arch/unicore32/Kconfig | 1 +
+ arch/unicore32/include/asm/unistd.h | 4 -
+ arch/x86/include/asm/apic.h | 2 +-
+ arch/x86/include/asm/compat.h | 74 +-
+ arch/x86/include/asm/ia32.h | 67 -
+ arch/x86/include/asm/xen/interface.h | 1 +
+ arch/x86/kernel/apic/apic_numachip.c | 4 +-
+ arch/x86/kernel/rtc.c | 2 +-
+ arch/x86/lguest/Kconfig | 1 -
+ arch/x86/xen/enlighten.c | 1 +
+ arch/x86/xen/irq.c | 1 +
+ arch/x86/xen/xen-ops.h | 1 -
+ arch/xtensa/include/asm/elf.h | 3 +-
+ drivers/acpi/acpica/Makefile | 1 +
+ drivers/acpi/acpica/achware.h | 3 +-
+ drivers/acpi/acpica/aclocal.h | 23 +-
+ drivers/acpi/acpica/acmacros.h | 29 +-
+ drivers/acpi/acpica/dswload.c | 14 +
+ drivers/acpi/acpica/dswload2.c | 14 +
+ drivers/acpi/acpica/evgpe.c | 24 +-
+ drivers/acpi/acpica/evxfgpe.c | 3 +-
+ drivers/acpi/acpica/hwgpe.c | 15 +-
+ drivers/acpi/acpica/hwxfsleep.c | 1 -
+ drivers/acpi/acpica/nsdump.c | 2 +-
+ drivers/acpi/acpica/tbinstal.c | 20 +-
+ drivers/acpi/acpica/tbxface.c | 41 +-
+ drivers/acpi/acpica/utosi.c | 1 +
+ drivers/acpi/acpica/utxface.c | 354 +-
+ drivers/acpi/acpica/utxfinit.c | 317 ++
+ drivers/acpi/bus.c | 8 +-
+ drivers/acpi/button.c | 13 +-
+ drivers/acpi/fan.c | 22 +-
+ drivers/acpi/glue.c | 135 +-
+ drivers/acpi/hed.c | 20 +-
+ drivers/acpi/proc.c | 57 +-
+ drivers/acpi/sbshc.c | 18 +-
+ drivers/acpi/scan.c | 56 +-
+ drivers/acpi/tables.c | 18 +-
+ drivers/acpi/utils.c | 11 +-
+ drivers/atm/eni.c | 2 +-
+ drivers/block/aoe/aoe.h | 93 +-
+ drivers/block/aoe/aoeblk.c | 91 +-
+ drivers/block/aoe/aoechr.c | 13 +-
+ drivers/block/aoe/aoecmd.c | 1232 ++++--
+ drivers/block/aoe/aoedev.c | 265 +-
+ drivers/block/aoe/aoemain.c | 10 +-
+ drivers/block/aoe/aoenet.c | 61 +-
+ drivers/block/nbd.c | 23 +-
+ drivers/block/rbd.c | 1790 ++++++---
+ drivers/block/rbd_types.h | 27 +-
+ drivers/block/virtio_blk.c | 306 +-
+ drivers/block/xen-blkback/blkback.c | 1 +
+ drivers/char/hw_random/omap-rng.c | 121 +-
+ drivers/char/mbcs.c | 2 +-
+ drivers/char/virtio_console.c | 198 +-
+ drivers/crypto/mv_cesa.c | 17 +-
+ drivers/crypto/nx/nx.c | 17 +-
+ drivers/dma/dmaengine.c | 2 +-
+ drivers/edac/mpc85xx_edac.c | 43 +-
+ drivers/gpio/Kconfig | 13 +
+ drivers/gpio/Makefile | 2 +
+ drivers/gpio/gpio-bt8xx.c | 2 +-
+ drivers/gpio/gpio-ich.c | 79 +-
+ drivers/gpio/gpio-mvebu.c | 679 ++++
+ drivers/gpio/gpio-twl6040.c | 137 +
+ drivers/hwmon/gpio-fan.c | 120 +
+ drivers/i2c/Kconfig | 17 +-
+ drivers/i2c/busses/Kconfig | 18 +-
+ drivers/i2c/busses/i2c-designware-core.c | 2 +-
+ drivers/i2c/busses/i2c-i801.c | 185 +-
+ drivers/i2c/busses/i2c-parport.c | 2 +-
+ drivers/i2c/busses/i2c-piix4.c | 1 +
+ drivers/i2c/busses/i2c-scmi.c | 14 +-
+ drivers/i2c/busses/i2c-viapro.c | 3 +
+ drivers/i2c/busses/scx200_acb.c | 24 +-
+ drivers/i2c/busses/scx200_i2c.c | 15 +-
+ drivers/i2c/i2c-core.c | 18 +-
+ drivers/i2c/i2c-mux.c | 22 +
+ drivers/i2c/i2c-smbus.c | 11 +-
+ drivers/i2c/muxes/i2c-mux-gpio.c | 56 +-
+ drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +-
+ drivers/i2c/muxes/i2c-mux-pca954x.c | 10 +-
+ drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
+ drivers/ide/aec62xx.c | 2 +-
+ drivers/ide/ali14xx.c | 4 +-
+ drivers/ide/alim15x3.c | 2 +-
+ drivers/ide/amd74xx.c | 2 +-
+ drivers/ide/atiixp.c | 2 +-
+ drivers/ide/cmd640.c | 2 +-
+ drivers/ide/cmd64x.c | 2 +-
+ drivers/ide/cs5520.c | 2 +-
+ drivers/ide/cs5530.c | 2 +-
+ drivers/ide/cs5535.c | 2 +-
+ drivers/ide/cy82c693.c | 2 +-
+ drivers/ide/dtc2278.c | 2 +-
+ drivers/ide/hpt366.c | 24 +-
+ drivers/ide/ht6560b.c | 2 +-
+ drivers/ide/icside.c | 2 +-
+ drivers/ide/ide-pci-generic.c | 2 +-
+ drivers/ide/it8172.c | 2 +-
+ drivers/ide/it8213.c | 2 +-
+ drivers/ide/it821x.c | 2 +-
+ drivers/ide/jmicron.c | 2 +-
+ drivers/ide/ns87415.c | 2 +-
+ drivers/ide/opti621.c | 2 +-
+ drivers/ide/pdc202xx_new.c | 2 +-
+ drivers/ide/pdc202xx_old.c | 2 +-
+ drivers/ide/piix.c | 2 +-
+ drivers/ide/qd65xx.c | 2 +-
+ drivers/ide/rz1000.c | 2 +-
+ drivers/ide/sc1200.c | 2 +-
+ drivers/ide/scc_pata.c | 2 +-
+ drivers/ide/serverworks.c | 2 +-
+ drivers/ide/siimage.c | 2 +-
+ drivers/ide/sis5513.c | 2 +-
+ drivers/ide/sl82c105.c | 2 +-
+ drivers/ide/slc90e66.c | 2 +-
+ drivers/ide/tc86c001.c | 2 +-
+ drivers/ide/triflex.c | 2 +-
+ drivers/ide/trm290.c | 2 +-
+ drivers/ide/tx4938ide.c | 2 +-
+ drivers/ide/tx4939ide.c | 2 +-
+ drivers/ide/umc8672.c | 2 +-
+ drivers/ide/via82cxxx.c | 2 +-
+ drivers/idle/intel_idle.c | 1 +
+ drivers/infiniband/core/cm.c | 2 +-
+ drivers/infiniband/core/cma.c | 6 +-
+ drivers/infiniband/hw/ehca/ehca_cq.c | 2 +-
+ drivers/infiniband/hw/ehca/ehca_eq.c | 2 +-
+ drivers/infiniband/hw/ehca/ehca_mrmw.c | 45 +-
+ drivers/infiniband/hw/ehca/ehca_qp.c | 6 +-
+ drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +-
+ drivers/infiniband/hw/ehca/ehca_tools.h | 1 -
+ drivers/infiniband/hw/ehca/hcp_if.c | 12 +-
+ drivers/infiniband/hw/ehca/ipz_pt_fn.c | 2 +-
+ drivers/infiniband/hw/mlx4/cm.c | 2 +-
+ drivers/infiniband/hw/nes/nes.c | 5 -
+ drivers/infiniband/hw/nes/nes.h | 3 +-
+ drivers/infiniband/hw/nes/nes_verbs.c | 16 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h | 4 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 31 -
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 31 +
+ drivers/infiniband/ulp/iser/iscsi_iser.h | 17 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 130 +-
+ drivers/input/misc/atlas_btns.c | 17 +-
+ drivers/input/misc/twl4030-vibra.c | 18 +-
+ drivers/input/touchscreen/88pm860x-ts.c | 127 +-
+ drivers/iommu/Kconfig | 2 +-
+ drivers/iommu/amd_iommu.c | 514 ++-
+ drivers/iommu/amd_iommu_init.c | 253 +-
+ drivers/iommu/amd_iommu_proto.h | 8 +
+ drivers/iommu/amd_iommu_types.h | 59 +-
+ drivers/iommu/exynos-iommu.c | 3 +-
+ drivers/iommu/intel-iommu.c | 4 +-
+ drivers/iommu/irq_remapping.c | 5 +
+ drivers/iommu/irq_remapping.h | 6 +
+ drivers/iommu/tegra-smmu.c | 261 +-
+ drivers/leds/leds-88pm860x.c | 205 +-
+ drivers/lguest/lguest_device.c | 5 +-
+ drivers/macintosh/macio_asic.c | 2 +-
+ drivers/macintosh/smu.c | 3 +-
+ drivers/media/Kconfig | 53 +-
+ drivers/media/Makefile | 23 +-
+ drivers/media/common/Kconfig | 12 +-
+ drivers/media/common/Makefile | 7 +-
+ drivers/media/common/b2c2/Kconfig | 28 +
+ drivers/media/common/b2c2/Makefile | 8 +
+ .../media/{dvb => common}/b2c2/flexcop-common.h | 0
+ .../media/{dvb => common}/b2c2/flexcop-eeprom.c | 0
+ .../media/{dvb => common}/b2c2/flexcop-fe-tuner.c | 0
+ .../media/{dvb => common}/b2c2/flexcop-hw-filter.c | 0
+ drivers/media/{dvb => common}/b2c2/flexcop-i2c.c | 0
+ drivers/media/{dvb => common}/b2c2/flexcop-misc.c | 0
+ drivers/media/{dvb => common}/b2c2/flexcop-reg.h | 0
+ drivers/media/{dvb => common}/b2c2/flexcop-sram.c | 0
+ drivers/media/{dvb => common}/b2c2/flexcop.c | 1 +
+ drivers/media/{dvb => common}/b2c2/flexcop.h | 0
+ .../{dvb => common}/b2c2/flexcop_ibi_value_be.h | 0
+ .../{dvb => common}/b2c2/flexcop_ibi_value_le.h | 0
+ drivers/media/common/saa7146/Kconfig | 9 +
+ drivers/media/common/saa7146/Makefile | 5 +
+ drivers/media/common/{ => saa7146}/saa7146_core.c | 8 -
+ drivers/media/common/{ => saa7146}/saa7146_fops.c | 55 +-
+ drivers/media/common/{ => saa7146}/saa7146_hlp.c | 0
+ drivers/media/common/{ => saa7146}/saa7146_i2c.c | 0
+ drivers/media/common/{ => saa7146}/saa7146_vbi.c | 0
+ drivers/media/common/{ => saa7146}/saa7146_video.c | 2 +-
+ drivers/media/common/siano/Kconfig | 17 +
+ drivers/media/{dvb => common}/siano/Makefile | 6 +-
+ drivers/media/{dvb => common}/siano/sms-cards.c | 0
+ drivers/media/{dvb => common}/siano/sms-cards.h | 0
+ drivers/media/{dvb => common}/siano/smscoreapi.c | 0
+ drivers/media/{dvb => common}/siano/smscoreapi.h | 0
+ drivers/media/{dvb => common}/siano/smsdvb.c | 0
+ drivers/media/{dvb => common}/siano/smsendian.c | 0
+ drivers/media/{dvb => common}/siano/smsendian.h | 0
+ drivers/media/{dvb => common}/siano/smsir.c | 0
+ drivers/media/{dvb => common}/siano/smsir.h | 0
+ drivers/media/dvb-core/Kconfig | 29 +
+ drivers/media/{dvb => }/dvb-core/Makefile | 0
+ drivers/media/{dvb => }/dvb-core/demux.h | 0
+ drivers/media/{dvb => }/dvb-core/dmxdev.c | 4 +-
+ drivers/media/{dvb => }/dvb-core/dmxdev.h | 0
+ .../media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h | 3 +
+ drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_demux.c | 29 +-
+ drivers/media/{dvb => }/dvb-core/dvb_demux.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_filter.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_filter.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_frontend.c | 368 +-
+ drivers/media/{dvb => }/dvb-core/dvb_frontend.h | 12 +-
+ drivers/media/{dvb => }/dvb-core/dvb_math.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_math.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_net.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_net.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h | 0
+ drivers/media/{dvb => }/dvb-core/dvbdev.c | 2 +-
+ drivers/media/{dvb => }/dvb-core/dvbdev.h | 26 -
+ .../media/{dvb/frontends => dvb-frontends}/Kconfig | 195 +-
+ .../{dvb/frontends => dvb-frontends}/Makefile | 12 +-
+ .../media/{dvb/frontends => dvb-frontends}/a8293.c | 0
+ .../media/{dvb/frontends => dvb-frontends}/a8293.h | 0
+ .../{dvb/frontends => dvb-frontends}/af9013.c | 158 +-
+ .../{dvb/frontends => dvb-frontends}/af9013.h | 2 +-
+ .../{dvb/frontends => dvb-frontends}/af9013_priv.h | 15 +-
+ .../{dvb/frontends => dvb-frontends}/af9033.c | 96 +-
+ .../{dvb/frontends => dvb-frontends}/af9033.h | 3 +-
+ .../{dvb/frontends => dvb-frontends}/af9033_priv.h | 37 +
+ .../{dvb/frontends => dvb-frontends}/atbm8830.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/atbm8830.h | 0
+ .../frontends => dvb-frontends}/atbm8830_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/au8522.h | 0
+ .../frontends => dvb-frontends}/au8522_common.c | 22 +-
+ .../frontends => dvb-frontends}/au8522_decoder.c | 11 +-
+ .../{dvb/frontends => dvb-frontends}/au8522_dig.c | 98 +-
+ .../{dvb/frontends => dvb-frontends}/au8522_priv.h | 29 +-
+ .../{dvb/frontends => dvb-frontends}/bcm3510.c | 0
+ .../{dvb/frontends => dvb-frontends}/bcm3510.h | 0
+ .../frontends => dvb-frontends}/bcm3510_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/bsbe1-d01a.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/bsbe1.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/bsru6.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx22700.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx22700.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx22702.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx22702.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx24110.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx24110.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx24113.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx24113.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx24116.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx24116.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx24123.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx24123.h | 0
+ .../{dvb/frontends => dvb-frontends}/cxd2820r.h | 14 +-
+ .../{dvb/frontends => dvb-frontends}/cxd2820r_c.c | 31 +-
+ .../frontends => dvb-frontends}/cxd2820r_core.c | 211 +-
+ .../frontends => dvb-frontends}/cxd2820r_priv.h | 22 +-
+ .../{dvb/frontends => dvb-frontends}/cxd2820r_t.c | 34 +-
+ .../{dvb/frontends => dvb-frontends}/cxd2820r_t2.c | 31 +-
+ .../{dvb/frontends => dvb-frontends}/dib0070.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib0070.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib0090.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib0090.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib3000.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib3000mb.c | 0
+ .../frontends => dvb-frontends}/dib3000mb_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib3000mc.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib3000mc.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib7000m.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib7000m.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib7000p.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib7000p.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib8000.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib8000.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib9000.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib9000.h | 0
+ .../frontends => dvb-frontends}/dibx000_common.c | 0
+ .../frontends => dvb-frontends}/dibx000_common.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/drxd.h | 0
+ .../{dvb/frontends => dvb-frontends}/drxd_firm.c | 0
+ .../{dvb/frontends => dvb-frontends}/drxd_firm.h | 0
+ .../{dvb/frontends => dvb-frontends}/drxd_hard.c | 0
+ .../frontends => dvb-frontends}/drxd_map_firm.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/drxk.h | 2 +
+ .../{dvb/frontends => dvb-frontends}/drxk_hard.c | 20 +-
+ .../{dvb/frontends => dvb-frontends}/drxk_hard.h | 0
+ .../{dvb/frontends => dvb-frontends}/drxk_map.h | 0
+ .../{dvb/frontends => dvb-frontends}/ds3000.c | 0
+ .../{dvb/frontends => dvb-frontends}/ds3000.h | 0
+ .../{dvb/frontends => dvb-frontends}/dvb-pll.c | 26 +
+ .../{dvb/frontends => dvb-frontends}/dvb-pll.h | 1 +
+ .../frontends => dvb-frontends}/dvb_dummy_fe.c | 0
+ .../frontends => dvb-frontends}/dvb_dummy_fe.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/ec100.c | 60 +-
+ .../media/{dvb/frontends => dvb-frontends}/ec100.h | 2 +-
+ .../{dvb/frontends => dvb-frontends}/eds1547.h | 0
+ .../{dvb/frontends => dvb-frontends}/hd29l2.c | 75 +-
+ .../{dvb/frontends => dvb-frontends}/hd29l2.h | 2 +-
+ .../{dvb/frontends => dvb-frontends}/hd29l2_priv.h | 13 -
+ .../{dvb/frontends => dvb-frontends}/isl6405.c | 0
+ .../{dvb/frontends => dvb-frontends}/isl6405.h | 0
+ .../{dvb/frontends => dvb-frontends}/isl6421.c | 0
+ .../{dvb/frontends => dvb-frontends}/isl6421.h | 0
+ .../{dvb/frontends => dvb-frontends}/isl6423.c | 0
+ .../{dvb/frontends => dvb-frontends}/isl6423.h | 0
+ .../frontends => dvb-frontends}/it913x-fe-priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/it913x-fe.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/it913x-fe.h | 0
+ .../{dvb/frontends => dvb-frontends}/itd1000.c | 0
+ .../{dvb/frontends => dvb-frontends}/itd1000.h | 0
+ .../frontends => dvb-frontends}/itd1000_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/ix2505v.c | 0
+ .../{dvb/frontends => dvb-frontends}/ix2505v.h | 0
+ .../{dvb/frontends => dvb-frontends}/l64781.c | 0
+ .../{dvb/frontends => dvb-frontends}/l64781.h | 0
+ .../{dvb/frontends => dvb-frontends}/lg2160.c | 0
+ .../{dvb/frontends => dvb-frontends}/lg2160.h | 0
+ .../{dvb/frontends => dvb-frontends}/lgdt3305.c | 0
+ .../{dvb/frontends => dvb-frontends}/lgdt3305.h | 0
+ .../{dvb/frontends => dvb-frontends}/lgdt330x.c | 0
+ .../{dvb/frontends => dvb-frontends}/lgdt330x.h | 0
+ .../frontends => dvb-frontends}/lgdt330x_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/lgs8gl5.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/lgs8gl5.h | 0
+ .../{dvb/frontends => dvb-frontends}/lgs8gxx.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/lgs8gxx.h | 0
+ .../frontends => dvb-frontends}/lgs8gxx_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/lnbh24.h | 0
+ .../{dvb/frontends => dvb-frontends}/lnbp21.c | 0
+ .../{dvb/frontends => dvb-frontends}/lnbp21.h | 0
+ .../{dvb/frontends => dvb-frontends}/lnbp22.c | 0
+ .../{dvb/frontends => dvb-frontends}/lnbp22.h | 0
+ .../{dvb/frontends => dvb-frontends}/m88rs2000.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/m88rs2000.h | 0
+ .../{dvb/frontends => dvb-frontends}/mb86a16.c | 0
+ .../{dvb/frontends => dvb-frontends}/mb86a16.h | 0
+ .../frontends => dvb-frontends}/mb86a16_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/mb86a20s.c | 0
+ .../{dvb/frontends => dvb-frontends}/mb86a20s.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/mt312.c | 0
+ .../media/{dvb/frontends => dvb-frontends}/mt312.h | 0
+ .../{dvb/frontends => dvb-frontends}/mt312_priv.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/mt352.c | 0
+ .../media/{dvb/frontends => dvb-frontends}/mt352.h | 0
+ .../{dvb/frontends => dvb-frontends}/mt352_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/nxt200x.c | 64 +-
+ .../{dvb/frontends => dvb-frontends}/nxt200x.h | 0
+ .../{dvb/frontends => dvb-frontends}/nxt6000.c | 0
+ .../{dvb/frontends => dvb-frontends}/nxt6000.h | 0
+ .../frontends => dvb-frontends}/nxt6000_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/or51132.c | 0
+ .../{dvb/frontends => dvb-frontends}/or51132.h | 0
+ .../{dvb/frontends => dvb-frontends}/or51211.c | 0
+ .../{dvb/frontends => dvb-frontends}/or51211.h | 0
+ .../{dvb/frontends => dvb-frontends}/rtl2830.c | 124 +-
+ .../{dvb/frontends => dvb-frontends}/rtl2830.h | 9 +-
+ .../frontends => dvb-frontends}/rtl2830_priv.h | 13 -
+ .../{dvb/frontends => dvb-frontends}/rtl2832.c | 301 +-
+ .../{dvb/frontends => dvb-frontends}/rtl2832.h | 13 +-
+ .../frontends => dvb-frontends}/rtl2832_priv.h | 112 +-
+ .../{dvb/frontends => dvb-frontends}/s5h1409.c | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1409.h | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1411.c | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1411.h | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1420.c | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1420.h | 0
+ .../frontends => dvb-frontends}/s5h1420_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1432.c | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1432.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/s921.c | 0
+ .../media/{dvb/frontends => dvb-frontends}/s921.h | 0
+ .../{dvb/frontends => dvb-frontends}/si21xx.c | 0
+ .../{dvb/frontends => dvb-frontends}/si21xx.h | 0
+ .../{dvb/frontends => dvb-frontends}/sp8870.c | 0
+ .../{dvb/frontends => dvb-frontends}/sp8870.h | 0
+ .../{dvb/frontends => dvb-frontends}/sp887x.c | 0
+ .../{dvb/frontends => dvb-frontends}/sp887x.h | 0
+ .../frontends => dvb-frontends}/stb0899_algo.c | 0
+ .../{dvb/frontends => dvb-frontends}/stb0899_cfg.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb0899_drv.c | 1 +
+ .../{dvb/frontends => dvb-frontends}/stb0899_drv.h | 0
+ .../frontends => dvb-frontends}/stb0899_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb0899_reg.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb6000.c | 0
+ .../{dvb/frontends => dvb-frontends}/stb6000.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb6100.c | 0
+ .../{dvb/frontends => dvb-frontends}/stb6100.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb6100_cfg.h | 0
+ .../frontends => dvb-frontends}/stb6100_proc.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0288.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv0288.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0297.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv0297.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0299.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv0299.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0367.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv0367.h | 0
+ .../frontends => dvb-frontends}/stv0367_priv.h | 0
+ .../frontends => dvb-frontends}/stv0367_regs.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0900.h | 0
+ .../frontends => dvb-frontends}/stv0900_core.c | 0
+ .../frontends => dvb-frontends}/stv0900_init.h | 0
+ .../frontends => dvb-frontends}/stv0900_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0900_reg.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0900_sw.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv090x.c | 32 +
+ .../{dvb/frontends => dvb-frontends}/stv090x.h | 0
+ .../frontends => dvb-frontends}/stv090x_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv090x_reg.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv6110.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv6110.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv6110x.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv6110x.h | 0
+ .../frontends => dvb-frontends}/stv6110x_priv.h | 0
+ .../frontends => dvb-frontends}/stv6110x_reg.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda10021.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda10023.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda1002x.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda10048.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda10048.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda1004x.c | 8 +-
+ .../{dvb/frontends => dvb-frontends}/tda1004x.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda10071.c | 7 +-
+ .../{dvb/frontends => dvb-frontends}/tda10071.h | 0
+ .../frontends => dvb-frontends}/tda10071_priv.h | 2 +-
+ .../{dvb/frontends => dvb-frontends}/tda10086.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda10086.h | 0
+ .../frontends => dvb-frontends}/tda18271c2dd.c | 0
+ .../frontends => dvb-frontends}/tda18271c2dd.h | 0
+ .../tda18271c2dd_maps.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda665x.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda665x.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda8083.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda8083.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda8261.c | 28 +-
+ .../{dvb/frontends => dvb-frontends}/tda8261.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda8261_cfg.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda826x.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda826x.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/tdhd1.h | 0
+ .../{dvb/frontends => dvb-frontends}/tua6100.c | 0
+ .../{dvb/frontends => dvb-frontends}/tua6100.h | 0
+ .../{dvb/frontends => dvb-frontends}/ves1820.c | 0
+ .../{dvb/frontends => dvb-frontends}/ves1820.h | 0
+ .../{dvb/frontends => dvb-frontends}/ves1x93.c | 0
+ .../{dvb/frontends => dvb-frontends}/ves1x93.h | 0
+ .../{dvb/frontends => dvb-frontends}/z0194a.h | 0
+ .../{dvb/frontends => dvb-frontends}/zl10036.c | 0
+ .../{dvb/frontends => dvb-frontends}/zl10036.h | 0
+ .../{dvb/frontends => dvb-frontends}/zl10039.c | 0
+ .../{dvb/frontends => dvb-frontends}/zl10039.h | 0
+ .../{dvb/frontends => dvb-frontends}/zl10353.c | 0
+ .../{dvb/frontends => dvb-frontends}/zl10353.h | 0
+ .../frontends => dvb-frontends}/zl10353_priv.h | 0
+ drivers/media/dvb/Kconfig | 91 -
+ drivers/media/dvb/Makefile | 21 -
+ drivers/media/dvb/b2c2/Kconfig | 45 -
+ drivers/media/dvb/b2c2/Makefile | 16 -
+ drivers/media/dvb/bt8xx/Kconfig | 22 -
+ drivers/media/dvb/bt8xx/Makefile | 6 -
+ drivers/media/dvb/dm1105/Makefile | 3 -
+ drivers/media/dvb/dvb-usb/Kconfig | 440 --
+ drivers/media/dvb/dvb-usb/Makefile | 121 -
+ drivers/media/dvb/dvb-usb/af9015.c | 1952 ---------
+ drivers/media/dvb/dvb-usb/it913x.c | 931 -----
+ drivers/media/dvb/dvb-usb/mxl111sf.c | 1835 ---------
+ drivers/media/dvb/frontends/ec100_priv.h | 39 -
+ drivers/media/dvb/ngene/Kconfig | 13 -
+ drivers/media/dvb/pluto2/Makefile | 3 -
+ drivers/media/dvb/siano/Kconfig | 34 -
+ drivers/media/dvb/ttusb-budget/Makefile | 3 -
+ drivers/media/{dvb => }/firewire/Kconfig | 0
+ drivers/media/{dvb => }/firewire/Makefile | 4 +-
+ drivers/media/{dvb => }/firewire/firedtv-avc.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-ci.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-dvb.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-fe.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-fw.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-rc.c | 0
+ drivers/media/{dvb => }/firewire/firedtv.h | 0
+ drivers/media/i2c/Kconfig | 591 +++
+ drivers/media/i2c/Makefile | 67 +
+ drivers/media/i2c/ad9389b.c | 1328 ++++++
+ drivers/media/{video => i2c}/adp1653.c | 2 +-
+ drivers/media/{video => i2c}/adv7170.c | 0
+ drivers/media/{video => i2c}/adv7175.c | 0
+ drivers/media/{video => i2c}/adv7180.c | 0
+ drivers/media/{video => i2c}/adv7183.c | 0
+ drivers/media/{video => i2c}/adv7183_regs.h | 0
+ drivers/media/{video => i2c}/adv7343.c | 0
+ drivers/media/{video => i2c}/adv7343_regs.h | 0
+ drivers/media/{video => i2c}/adv7393.c | 0
+ drivers/media/{video => i2c}/adv7393_regs.h | 0
+ drivers/media/i2c/adv7604.c | 1959 +++++++++
+ drivers/media/{video => i2c}/ak881x.c | 0
+ drivers/media/{video => i2c}/aptina-pll.c | 0
+ drivers/media/{video => i2c}/aptina-pll.h | 0
+ drivers/media/{video => i2c}/as3645a.c | 2 +-
+ drivers/media/{video => i2c}/bt819.c | 0
+ drivers/media/{video => i2c}/bt856.c | 0
+ drivers/media/{video => i2c}/bt866.c | 0
+ drivers/media/{video => i2c}/btcx-risc.c | 0
+ drivers/media/{video => i2c}/btcx-risc.h | 0
+ drivers/media/{video => i2c}/cs5345.c | 0
+ drivers/media/{video => i2c}/cs53l32a.c | 0
+ drivers/media/{video => i2c}/cx2341x.c | 0
+ drivers/media/{video => i2c}/cx25840/Kconfig | 0
+ drivers/media/{video => i2c}/cx25840/Makefile | 2 +-
+ .../media/{video => i2c}/cx25840/cx25840-audio.c | 0
+ .../media/{video => i2c}/cx25840/cx25840-core.c | 0
+ .../media/{video => i2c}/cx25840/cx25840-core.h | 0
+ .../{video => i2c}/cx25840/cx25840-firmware.c | 15 +-
+ drivers/media/{video => i2c}/cx25840/cx25840-ir.c | 0
+ drivers/media/{video => i2c}/cx25840/cx25840-vbi.c | 3 +-
+ drivers/media/{video => i2c}/ir-kbd-i2c.c | 0
+ drivers/media/{video => i2c}/ks0127.c | 13 +-
+ drivers/media/{video => i2c}/ks0127.h | 0
+ drivers/media/{video => i2c}/m52790.c | 0
+ drivers/media/{video => i2c}/m5mols/Kconfig | 0
+ drivers/media/{video => i2c}/m5mols/Makefile | 0
+ drivers/media/{video => i2c}/m5mols/m5mols.h | 22 +-
+ .../media/{video => i2c}/m5mols/m5mols_capture.c | 0
+ .../media/{video => i2c}/m5mols/m5mols_controls.c | 4 +-
+ drivers/media/{video => i2c}/m5mols/m5mols_core.c | 90 +-
+ drivers/media/{video => i2c}/m5mols/m5mols_reg.h | 0
+ drivers/media/{video => i2c}/msp3400-driver.c | 40 +-
+ drivers/media/{video => i2c}/msp3400-driver.h | 0
+ drivers/media/{video => i2c}/msp3400-kthreads.c | 0
+ drivers/media/{video => i2c}/mt9m032.c | 2 +-
+ drivers/media/{video => i2c}/mt9p031.c | 12 +-
+ drivers/media/{video => i2c}/mt9t001.c | 0
+ drivers/media/{video => i2c}/mt9v011.c | 0
+ drivers/media/{video => i2c}/mt9v032.c | 100 +-
+ drivers/media/{video => i2c}/noon010pc30.c | 0
+ drivers/media/{video => i2c}/ov7670.c | 0
+ drivers/media/i2c/s5k4ecgx.c | 1036 +++++
+ drivers/media/{video => i2c}/s5k6aa.c | 20 +-
+ drivers/media/{video => i2c}/saa6588.c | 0
+ drivers/media/{video => i2c}/saa7110.c | 0
+ drivers/media/{video => i2c}/saa7115.c | 3 +-
+ drivers/media/{video => i2c}/saa711x_regs.h | 0
+ drivers/media/{video => i2c}/saa7127.c | 7 +-
+ drivers/media/{video => i2c}/saa717x.c | 0
+ drivers/media/{video => i2c}/saa7185.c | 0
+ drivers/media/{video => i2c}/saa7191.c | 0
+ drivers/media/{video => i2c}/saa7191.h | 0
+ drivers/media/{video => i2c}/smiapp-pll.c | 2 +-
+ drivers/media/{video => i2c}/smiapp-pll.h | 2 +-
+ drivers/media/{video => i2c}/smiapp/Kconfig | 0
+ drivers/media/{video => i2c}/smiapp/Makefile | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-core.c | 83 +-
+ .../media/{video => i2c}/smiapp/smiapp-limits.c | 2 +-
+ .../media/{video => i2c}/smiapp/smiapp-limits.h | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-quirk.c | 22 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-quirk.h | 2 +-
+ .../media/{video => i2c}/smiapp/smiapp-reg-defs.h | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-reg.h | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-regs.c | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-regs.h | 0
+ drivers/media/{video => i2c}/smiapp/smiapp.h | 2 +-
+ drivers/media/i2c/soc_camera/Kconfig | 89 +
+ drivers/media/i2c/soc_camera/Makefile | 14 +
+ drivers/media/{video => i2c/soc_camera}/imx074.c | 30 +-
+ drivers/media/{video => i2c/soc_camera}/mt9m001.c | 28 +-
+ drivers/media/{video => i2c/soc_camera}/mt9m111.c | 118 +-
+ drivers/media/{video => i2c/soc_camera}/mt9t031.c | 50 +-
+ drivers/media/{video => i2c/soc_camera}/mt9t112.c | 25 +-
+ drivers/media/{video => i2c/soc_camera}/mt9v022.c | 52 +-
+ drivers/media/{video => i2c/soc_camera}/ov2640.c | 20 +-
+ drivers/media/{video => i2c/soc_camera}/ov5642.c | 51 +-
+ drivers/media/{video => i2c/soc_camera}/ov6650.c | 60 +-
+ drivers/media/{video => i2c/soc_camera}/ov772x.c | 447 ++-
+ drivers/media/{video => i2c/soc_camera}/ov9640.c | 27 +-
+ drivers/media/{video => i2c/soc_camera}/ov9640.h | 0
+ drivers/media/{video => i2c/soc_camera}/ov9740.c | 47 +-
+ .../media/{video => i2c/soc_camera}/rj54n1cb0c.c | 31 +-
+ drivers/media/{video => i2c/soc_camera}/tw9910.c | 21 +-
+ drivers/media/{video => i2c}/sr030pc30.c | 0
+ drivers/media/{video => i2c}/tcm825x.c | 2 +-
+ drivers/media/{video => i2c}/tcm825x.h | 2 +-
+ drivers/media/{video => i2c}/tda7432.c | 0
+ drivers/media/{video => i2c}/tda9840.c | 0
+ drivers/media/{video => i2c}/tea6415c.c | 4 +-
+ drivers/media/{video => i2c}/tea6415c.h | 0
+ drivers/media/{video => i2c}/tea6420.c | 0
+ drivers/media/{video => i2c}/tea6420.h | 0
+ drivers/media/{video => i2c}/ths7303.c | 0
+ drivers/media/{video => i2c}/tlv320aic23b.c | 0
+ drivers/media/{video => i2c}/tvaudio.c | 17 +-
+ drivers/media/{video => i2c}/tveeprom.c | 0
+ drivers/media/{video => i2c}/tvp514x.c | 2 +-
+ drivers/media/{video => i2c}/tvp514x_regs.h | 2 +-
+ drivers/media/{video => i2c}/tvp5150.c | 4 +-
+ drivers/media/{video => i2c}/tvp5150_reg.h | 0
+ drivers/media/{video => i2c}/tvp7002.c | 0
+ drivers/media/{video => i2c}/tvp7002_reg.h | 0
+ drivers/media/{video => i2c}/upd64031a.c | 0
+ drivers/media/{video => i2c}/upd64083.c | 0
+ drivers/media/{video => i2c}/vp27smpx.c | 0
+ drivers/media/{video => i2c}/vpx3220.c | 0
+ drivers/media/{video => i2c}/vs6624.c | 0
+ drivers/media/{video => i2c}/vs6624_regs.h | 0
+ drivers/media/{video => i2c}/wm8739.c | 0
+ drivers/media/{video => i2c}/wm8775.c | 0
+ drivers/media/media-device.c | 4 +-
+ drivers/media/media-devnode.c | 14 +-
+ drivers/media/mmc/Kconfig | 2 +
+ drivers/media/mmc/Makefile | 1 +
+ drivers/media/mmc/siano/Kconfig | 10 +
+ drivers/media/mmc/siano/Makefile | 6 +
+ drivers/media/{dvb => mmc}/siano/smssdio.c | 0
+ drivers/media/parport/Kconfig | 52 +
+ drivers/media/parport/Makefile | 4 +
+ drivers/media/{video => parport}/bw-qcam.c | 0
+ drivers/media/{video => parport}/c-qcam.c | 0
+ drivers/media/{video => parport}/pms.c | 0
+ drivers/media/{video => parport}/w9966.c | 0
+ drivers/media/pci/Kconfig | 47 +
+ drivers/media/pci/Makefile | 26 +
+ drivers/media/pci/b2c2/Kconfig | 15 +
+ drivers/media/pci/b2c2/Makefile | 9 +
+ drivers/media/{dvb => pci}/b2c2/flexcop-dma.c | 0
+ drivers/media/{dvb => pci}/b2c2/flexcop-pci.c | 0
+ drivers/media/pci/bt8xx/Kconfig | 43 +
+ drivers/media/pci/bt8xx/Makefile | 11 +
+ drivers/media/{video => pci}/bt8xx/bt848.h | 0
+ drivers/media/{dvb => pci}/bt8xx/bt878.c | 0
+ drivers/media/{dvb => pci}/bt8xx/bt878.h | 0
+ .../media/{video => pci}/bt8xx/bttv-audio-hook.c | 0
+ .../media/{video => pci}/bt8xx/bttv-audio-hook.h | 0
+ drivers/media/{video => pci}/bt8xx/bttv-cards.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-driver.c | 16 +-
+ drivers/media/{video => pci}/bt8xx/bttv-gpio.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-i2c.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-if.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-input.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-risc.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-vbi.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv.h | 0
+ drivers/media/{video => pci}/bt8xx/bttvp.h | 0
+ drivers/media/{dvb => pci}/bt8xx/dst.c | 0
+ drivers/media/{dvb => pci}/bt8xx/dst_ca.c | 3 +-
+ drivers/media/{dvb => pci}/bt8xx/dst_ca.h | 0
+ drivers/media/{dvb => pci}/bt8xx/dst_common.h | 0
+ drivers/media/{dvb => pci}/bt8xx/dst_priv.h | 0
+ drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c | 0
+ drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h | 0
+ drivers/media/{video => pci}/cx18/Kconfig | 14 +-
+ drivers/media/{video => pci}/cx18/Makefile | 6 +-
+ drivers/media/{video => pci}/cx18/cx18-alsa-main.c | 0
+ .../media/{video => pci}/cx18/cx18-alsa-mixer.c | 0
+ .../media/{video => pci}/cx18/cx18-alsa-mixer.h | 0
+ drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c | 0
+ drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h | 0
+ drivers/media/{video => pci}/cx18/cx18-alsa.h | 0
+ drivers/media/{video => pci}/cx18/cx18-audio.c | 0
+ drivers/media/{video => pci}/cx18/cx18-audio.h | 0
+ drivers/media/{video => pci}/cx18/cx18-av-audio.c | 0
+ drivers/media/{video => pci}/cx18/cx18-av-core.c | 0
+ drivers/media/{video => pci}/cx18/cx18-av-core.h | 0
+ .../media/{video => pci}/cx18/cx18-av-firmware.c | 2 +
+ drivers/media/{video => pci}/cx18/cx18-av-vbi.c | 4 +-
+ drivers/media/{video => pci}/cx18/cx18-cards.c | 0
+ drivers/media/{video => pci}/cx18/cx18-cards.h | 0
+ drivers/media/{video => pci}/cx18/cx18-controls.c | 0
+ drivers/media/{video => pci}/cx18/cx18-controls.h | 0
+ drivers/media/{video => pci}/cx18/cx18-driver.c | 1 +
+ drivers/media/{video => pci}/cx18/cx18-driver.h | 0
+ drivers/media/{video => pci}/cx18/cx18-dvb.c | 6 +-
+ drivers/media/{video => pci}/cx18/cx18-dvb.h | 0
+ drivers/media/{video => pci}/cx18/cx18-fileops.c | 0
+ drivers/media/{video => pci}/cx18/cx18-fileops.h | 0
+ drivers/media/{video => pci}/cx18/cx18-firmware.c | 10 +-
+ drivers/media/{video => pci}/cx18/cx18-firmware.h | 0
+ drivers/media/{video => pci}/cx18/cx18-gpio.c | 0
+ drivers/media/{video => pci}/cx18/cx18-gpio.h | 0
+ drivers/media/{video => pci}/cx18/cx18-i2c.c | 0
+ drivers/media/{video => pci}/cx18/cx18-i2c.h | 0
+ drivers/media/{video => pci}/cx18/cx18-io.c | 0
+ drivers/media/{video => pci}/cx18/cx18-io.h | 0
+ drivers/media/{video => pci}/cx18/cx18-ioctl.c | 8 +-
+ drivers/media/{video => pci}/cx18/cx18-ioctl.h | 0
+ drivers/media/{video => pci}/cx18/cx18-irq.c | 0
+ drivers/media/{video => pci}/cx18/cx18-irq.h | 0
+ drivers/media/{video => pci}/cx18/cx18-mailbox.c | 0
+ drivers/media/{video => pci}/cx18/cx18-mailbox.h | 0
+ drivers/media/{video => pci}/cx18/cx18-queue.c | 0
+ drivers/media/{video => pci}/cx18/cx18-queue.h | 0
+ drivers/media/{video => pci}/cx18/cx18-scb.c | 0
+ drivers/media/{video => pci}/cx18/cx18-scb.h | 0
+ drivers/media/{video => pci}/cx18/cx18-streams.c | 15 +-
+ drivers/media/{video => pci}/cx18/cx18-streams.h | 0
+ drivers/media/{video => pci}/cx18/cx18-vbi.c | 0
+ drivers/media/{video => pci}/cx18/cx18-vbi.h | 0
+ drivers/media/{video => pci}/cx18/cx18-version.h | 0
+ drivers/media/{video => pci}/cx18/cx18-video.c | 0
+ drivers/media/{video => pci}/cx18/cx18-video.h | 0
+ drivers/media/{video => pci}/cx18/cx23418.h | 0
+ drivers/media/pci/cx23885/Kconfig | 50 +
+ drivers/media/{video => pci}/cx23885/Makefile | 8 +-
+ drivers/media/{video => pci}/cx23885/altera-ci.c | 4 +-
+ drivers/media/{video => pci}/cx23885/altera-ci.h | 0
+ drivers/media/{video => pci}/cx23885/cimax2.c | 0
+ drivers/media/{video => pci}/cx23885/cimax2.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-417.c | 2 +
+ .../media/{video => pci}/cx23885/cx23885-alsa.c | 0
+ drivers/media/{video => pci}/cx23885/cx23885-av.c | 0
+ drivers/media/{video => pci}/cx23885/cx23885-av.h | 0
+ .../media/{video => pci}/cx23885/cx23885-cards.c | 16 +-
+ .../media/{video => pci}/cx23885/cx23885-core.c | 0
+ drivers/media/{video => pci}/cx23885/cx23885-dvb.c | 59 +-
+ .../media/{video => pci}/cx23885/cx23885-f300.c | 0
+ .../media/{video => pci}/cx23885/cx23885-f300.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-i2c.c | 0
+ .../media/{video => pci}/cx23885/cx23885-input.c | 9 +
+ .../media/{video => pci}/cx23885/cx23885-input.h | 0
+ .../media/{video => pci}/cx23885/cx23885-ioctl.c | 0
+ .../media/{video => pci}/cx23885/cx23885-ioctl.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-ir.c | 0
+ drivers/media/{video => pci}/cx23885/cx23885-ir.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-reg.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-vbi.c | 0
+ .../media/{video => pci}/cx23885/cx23885-video.c | 2 +-
+ drivers/media/{video => pci}/cx23885/cx23885.h | 1 +
+ drivers/media/{video => pci}/cx23885/cx23888-ir.c | 0
+ drivers/media/{video => pci}/cx23885/cx23888-ir.h | 0
+ .../media/{video => pci}/cx23885/netup-eeprom.c | 0
+ .../media/{video => pci}/cx23885/netup-eeprom.h | 0
+ drivers/media/{video => pci}/cx23885/netup-init.c | 0
+ drivers/media/{video => pci}/cx23885/netup-init.h | 0
+ drivers/media/{video => pci}/cx25821/Kconfig | 0
+ drivers/media/{video => pci}/cx25821/Makefile | 8 +-
+ .../media/{video => pci}/cx25821/cx25821-alsa.c | 0
+ .../cx25821/cx25821-audio-upstream.c | 0
+ .../cx25821/cx25821-audio-upstream.h | 0
+ .../media/{video => pci}/cx25821/cx25821-audio.h | 0
+ .../{video => pci}/cx25821/cx25821-biffuncs.h | 0
+ .../media/{video => pci}/cx25821/cx25821-cards.c | 0
+ .../media/{video => pci}/cx25821/cx25821-core.c | 0
+ .../media/{video => pci}/cx25821/cx25821-gpio.c | 0
+ drivers/media/{video => pci}/cx25821/cx25821-i2c.c | 0
+ .../cx25821/cx25821-medusa-defines.h | 0
+ .../{video => pci}/cx25821/cx25821-medusa-reg.h | 0
+ .../{video => pci}/cx25821/cx25821-medusa-video.c | 0
+ .../{video => pci}/cx25821/cx25821-medusa-video.h | 0
+ drivers/media/{video => pci}/cx25821/cx25821-reg.h | 0
+ .../media/{video => pci}/cx25821/cx25821-sram.h | 0
+ .../cx25821/cx25821-video-upstream-ch2.c | 0
+ .../cx25821/cx25821-video-upstream-ch2.h | 0
+ .../cx25821/cx25821-video-upstream.c | 0
+ .../cx25821/cx25821-video-upstream.h | 0
+ .../media/{video => pci}/cx25821/cx25821-video.c | 2 +-
+ .../media/{video => pci}/cx25821/cx25821-video.h | 2 +-
+ drivers/media/{video => pci}/cx25821/cx25821.h | 0
+ drivers/media/{video => pci}/cx88/Kconfig | 36 +-
+ drivers/media/{video => pci}/cx88/Makefile | 8 +-
+ drivers/media/{video => pci}/cx88/cx88-alsa.c | 2 +-
+ drivers/media/{video => pci}/cx88/cx88-blackbird.c | 2 +-
+ drivers/media/{video => pci}/cx88/cx88-cards.c | 4 +-
+ drivers/media/{video => pci}/cx88/cx88-core.c | 2 +-
+ drivers/media/{video => pci}/cx88/cx88-dsp.c | 0
+ drivers/media/{video => pci}/cx88/cx88-dvb.c | 2 +-
+ drivers/media/{video => pci}/cx88/cx88-i2c.c | 0
+ drivers/media/{video => pci}/cx88/cx88-input.c | 0
+ drivers/media/{video => pci}/cx88/cx88-mpeg.c | 0
+ drivers/media/{video => pci}/cx88/cx88-reg.h | 0
+ drivers/media/{video => pci}/cx88/cx88-tvaudio.c | 0
+ drivers/media/{video => pci}/cx88/cx88-vbi.c | 0
+ drivers/media/{video => pci}/cx88/cx88-video.c | 2 +-
+ .../media/{video => pci}/cx88/cx88-vp3054-i2c.c | 0
+ .../media/{video => pci}/cx88/cx88-vp3054-i2c.h | 0
+ drivers/media/{video => pci}/cx88/cx88.h | 2 +-
+ drivers/media/{dvb => pci}/ddbridge/Kconfig | 10 +-
+ drivers/media/{dvb => pci}/ddbridge/Makefile | 6 +-
+ .../media/{dvb => pci}/ddbridge/ddbridge-core.c | 15 +-
+ .../media/{dvb => pci}/ddbridge/ddbridge-regs.h | 0
+ drivers/media/{dvb => pci}/ddbridge/ddbridge.h | 0
+ drivers/media/{dvb => pci}/dm1105/Kconfig | 14 +-
+ drivers/media/pci/dm1105/Makefile | 3 +
+ drivers/media/{dvb => pci}/dm1105/dm1105.c | 0
+ drivers/media/{video => pci}/ivtv/Kconfig | 16 +
+ drivers/media/{video => pci}/ivtv/Makefile | 10 +-
+ drivers/media/pci/ivtv/ivtv-alsa-main.c | 303 ++
+ drivers/media/pci/ivtv/ivtv-alsa-mixer.c | 175 +
+ drivers/media/pci/ivtv/ivtv-alsa-mixer.h | 23 +
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 356 ++
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.h | 27 +
+ drivers/media/pci/ivtv/ivtv-alsa.h | 75 +
+ drivers/media/{video => pci}/ivtv/ivtv-cards.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-cards.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-controls.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-controls.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-driver.c | 38 +
+ drivers/media/{video => pci}/ivtv/ivtv-driver.h | 11 +
+ drivers/media/{video => pci}/ivtv/ivtv-fileops.c | 61 +-
+ drivers/media/{video => pci}/ivtv/ivtv-fileops.h | 4 +-
+ drivers/media/{video => pci}/ivtv/ivtv-firmware.c | 4 +
+ drivers/media/{video => pci}/ivtv/ivtv-firmware.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-gpio.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-gpio.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-i2c.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-i2c.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-ioctl.c | 108 +-
+ drivers/media/{video => pci}/ivtv/ivtv-ioctl.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-irq.c | 50 +
+ drivers/media/{video => pci}/ivtv/ivtv-irq.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-mailbox.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-mailbox.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-queue.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-queue.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-routing.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-routing.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-streams.c | 51 +-
+ drivers/media/{video => pci}/ivtv/ivtv-streams.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-udma.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-udma.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-vbi.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-vbi.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-version.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-yuv.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-yuv.h | 0
+ drivers/media/{video => pci}/ivtv/ivtvfb.c | 0
+ drivers/media/{dvb => pci}/mantis/Kconfig | 20 +-
+ drivers/media/{dvb => pci}/mantis/Makefile | 2 +-
+ drivers/media/{dvb => pci}/mantis/hopper_cards.c | 0
+ drivers/media/{dvb => pci}/mantis/hopper_vp3028.c | 0
+ drivers/media/{dvb => pci}/mantis/hopper_vp3028.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_ca.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_ca.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_cards.c | 2 +-
+ drivers/media/{dvb => pci}/mantis/mantis_common.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_core.c | 2 +-
+ drivers/media/{dvb => pci}/mantis/mantis_core.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_dma.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_dma.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_dvb.c | 6 +-
+ drivers/media/{dvb => pci}/mantis/mantis_dvb.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_evm.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_hif.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_hif.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_i2c.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_i2c.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_input.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_ioc.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_ioc.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_link.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_pci.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_pci.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_reg.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_uart.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_uart.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1033.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1033.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1034.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1034.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1041.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1041.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp2033.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp2033.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp2040.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp2040.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp3028.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp3028.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp3030.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp3030.h | 0
+ drivers/media/pci/meye/Kconfig | 13 +
+ drivers/media/pci/meye/Makefile | 1 +
+ drivers/media/{video => pci/meye}/meye.c | 0
+ drivers/media/{video => pci/meye}/meye.h | 0
+ drivers/media/pci/ngene/Kconfig | 13 +
+ drivers/media/{dvb => pci}/ngene/Makefile | 6 +-
+ drivers/media/{dvb => pci}/ngene/ngene-cards.c | 263 ++
+ drivers/media/{dvb => pci}/ngene/ngene-core.c | 14 +-
+ drivers/media/{dvb => pci}/ngene/ngene-dvb.c | 0
+ drivers/media/{dvb => pci}/ngene/ngene-i2c.c | 0
+ drivers/media/{dvb => pci}/ngene/ngene.h | 0
+ drivers/media/{dvb => pci}/pluto2/Kconfig | 0
+ drivers/media/pci/pluto2/Makefile | 3 +
+ drivers/media/{dvb => pci}/pluto2/pluto2.c | 0
+ drivers/media/{dvb => pci}/pt1/Kconfig | 0
+ drivers/media/{dvb => pci}/pt1/Makefile | 2 +-
+ drivers/media/{dvb => pci}/pt1/pt1.c | 0
+ drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c | 11 +-
+ drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h | 0
+ drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c | 0
+ drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h | 0
+ drivers/media/{video => pci}/saa7134/Kconfig | 40 +-
+ drivers/media/{video => pci}/saa7134/Makefile | 10 +-
+ drivers/media/{video => pci}/saa7134/saa6752hs.c | 0
+ .../media/{video => pci}/saa7134/saa7134-alsa.c | 0
+ .../media/{video => pci}/saa7134/saa7134-cards.c | 0
+ .../media/{video => pci}/saa7134/saa7134-core.c | 0
+ drivers/media/{video => pci}/saa7134/saa7134-dvb.c | 4 +-
+ .../media/{video => pci}/saa7134/saa7134-empress.c | 0
+ drivers/media/{video => pci}/saa7134/saa7134-i2c.c | 0
+ .../media/{video => pci}/saa7134/saa7134-input.c | 10 +-
+ drivers/media/{video => pci}/saa7134/saa7134-reg.h | 0
+ drivers/media/{video => pci}/saa7134/saa7134-ts.c | 0
+ .../media/{video => pci}/saa7134/saa7134-tvaudio.c | 0
+ drivers/media/{video => pci}/saa7134/saa7134-vbi.c | 0
+ .../media/{video => pci}/saa7134/saa7134-video.c | 38 +-
+ drivers/media/{video => pci}/saa7134/saa7134.h | 1 -
+ drivers/media/pci/saa7146/Kconfig | 38 +
+ drivers/media/pci/saa7146/Makefile | 5 +
+ .../media/{video => pci/saa7146}/hexium_gemini.c | 0
+ .../media/{video => pci/saa7146}/hexium_orion.c | 0
+ drivers/media/{video => pci/saa7146}/mxb.c | 2 +-
+ drivers/media/{video => pci}/saa7164/Kconfig | 8 +-
+ drivers/media/{video => pci}/saa7164/Makefile | 8 +-
+ drivers/media/{video => pci}/saa7164/saa7164-api.c | 15 +-
+ .../media/{video => pci}/saa7164/saa7164-buffer.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-bus.c | 0
+ .../media/{video => pci}/saa7164/saa7164-cards.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-cmd.c | 0
+ .../media/{video => pci}/saa7164/saa7164-core.c | 46 +-
+ drivers/media/{video => pci}/saa7164/saa7164-dvb.c | 0
+ .../media/{video => pci}/saa7164/saa7164-encoder.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-fw.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-i2c.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-reg.h | 0
+ .../media/{video => pci}/saa7164/saa7164-types.h | 0
+ drivers/media/{video => pci}/saa7164/saa7164-vbi.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164.h | 1 -
+ drivers/media/pci/sta2x11/Kconfig | 12 +
+ drivers/media/pci/sta2x11/Makefile | 1 +
+ drivers/media/{video => pci/sta2x11}/sta2x11_vip.c | 0
+ drivers/media/{video => pci/sta2x11}/sta2x11_vip.h | 0
+ drivers/media/{dvb => pci}/ttpci/Kconfig | 84 +-
+ drivers/media/{dvb => pci}/ttpci/Makefile | 4 +-
+ drivers/media/{dvb => pci}/ttpci/av7110.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_av.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_av.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ca.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ca.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_hw.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_hw.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ipack.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ipack.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ir.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_v4l.c | 2 +-
+ drivers/media/{dvb => pci}/ttpci/budget-av.c | 0
+ drivers/media/{dvb => pci}/ttpci/budget-ci.c | 0
+ drivers/media/{dvb => pci}/ttpci/budget-core.c | 0
+ drivers/media/{dvb => pci}/ttpci/budget-patch.c | 0
+ drivers/media/{dvb => pci}/ttpci/budget.c | 60 +
+ drivers/media/{dvb => pci}/ttpci/budget.h | 0
+ drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c | 0
+ drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h | 0
+ drivers/media/{video => pci}/zoran/Kconfig | 30 +-
+ drivers/media/{video => pci}/zoran/Makefile | 0
+ drivers/media/{video => pci}/zoran/videocodec.c | 0
+ drivers/media/{video => pci}/zoran/videocodec.h | 0
+ drivers/media/{video => pci}/zoran/zoran.h | 0
+ drivers/media/{video => pci}/zoran/zoran_card.c | 4 +
+ drivers/media/{video => pci}/zoran/zoran_card.h | 0
+ drivers/media/{video => pci}/zoran/zoran_device.c | 0
+ drivers/media/{video => pci}/zoran/zoran_device.h | 0
+ drivers/media/{video => pci}/zoran/zoran_driver.c | 8 +-
+ drivers/media/{video => pci}/zoran/zoran_procfs.c | 0
+ drivers/media/{video => pci}/zoran/zoran_procfs.h | 0
+ drivers/media/{video => pci}/zoran/zr36016.c | 0
+ drivers/media/{video => pci}/zoran/zr36016.h | 0
+ drivers/media/{video => pci}/zoran/zr36050.c | 0
+ drivers/media/{video => pci}/zoran/zr36050.h | 0
+ drivers/media/{video => pci}/zoran/zr36057.h | 0
+ drivers/media/{video => pci}/zoran/zr36060.c | 0
+ drivers/media/{video => pci}/zoran/zr36060.h | 0
+ drivers/media/platform/Kconfig | 223 +
+ drivers/media/platform/Makefile | 50 +
+ drivers/media/{video => platform}/arv.c | 0
+ drivers/media/{video => platform}/blackfin/Kconfig | 0
+ .../media/{video => platform}/blackfin/Makefile | 0
+ .../{video => platform}/blackfin/bfin_capture.c | 18 +-
+ drivers/media/{video => platform}/blackfin/ppi.c | 0
+ drivers/media/platform/coda.c | 2049 ++++++++++
+ drivers/media/platform/coda.h | 238 ++
+ drivers/media/{video => platform}/davinci/Kconfig | 4 +-
+ drivers/media/{video => platform}/davinci/Makefile | 0
+ .../{video => platform}/davinci/ccdc_hw_device.h | 0
+ .../media/{video => platform}/davinci/dm355_ccdc.c | 2 +-
+ .../{video => platform}/davinci/dm355_ccdc_regs.h | 0
+ .../{video => platform}/davinci/dm644x_ccdc.c | 2 +-
+ .../{video => platform}/davinci/dm644x_ccdc_regs.h | 0
+ drivers/media/{video => platform}/davinci/isif.c | 2 +-
+ .../media/{video => platform}/davinci/isif_regs.h | 0
+ drivers/media/{video => platform}/davinci/vpbe.c | 0
+ .../{video => platform}/davinci/vpbe_display.c | 25 +-
+ .../media/{video => platform}/davinci/vpbe_osd.c | 0
+ .../{video => platform}/davinci/vpbe_osd_regs.h | 0
+ .../media/{video => platform}/davinci/vpbe_venc.c | 0
+ .../{video => platform}/davinci/vpbe_venc_regs.h | 0
+ .../{video => platform}/davinci/vpfe_capture.c | 19 +-
+ drivers/media/{video => platform}/davinci/vpif.c | 18 +-
+ drivers/media/{video => platform}/davinci/vpif.h | 4 +-
+ .../{video => platform}/davinci/vpif_capture.c | 146 +-
+ .../{video => platform}/davinci/vpif_capture.h | 4 +-
+ .../{video => platform}/davinci/vpif_display.c | 141 +-
+ .../{video => platform}/davinci/vpif_display.h | 4 +-
+ drivers/media/{video => platform}/davinci/vpss.c | 2 +-
+ drivers/media/platform/exynos-gsc/Makefile | 3 +
+ drivers/media/platform/exynos-gsc/gsc-core.c | 1252 ++++++
+ drivers/media/platform/exynos-gsc/gsc-core.h | 527 +++
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 770 ++++
+ drivers/media/platform/exynos-gsc/gsc-regs.c | 425 ++
+ drivers/media/platform/exynos-gsc/gsc-regs.h | 172 +
+ drivers/media/{video => platform}/fsl-viu.c | 29 +-
+ drivers/media/{video => platform}/indycam.c | 0
+ drivers/media/{video => platform}/indycam.h | 0
+ drivers/media/platform/m2m-deinterlace.c | 1124 ++++++
+ .../media/{video => platform}/marvell-ccic/Kconfig | 0
+ .../{video => platform}/marvell-ccic/Makefile | 0
+ .../{video => platform}/marvell-ccic/cafe-driver.c | 0
+ .../{video => platform}/marvell-ccic/mcam-core.c | 0
+ .../{video => platform}/marvell-ccic/mcam-core.h | 0
+ .../{video => platform}/marvell-ccic/mmp-driver.c | 0
+ .../media/{video => platform}/mem2mem_testdev.c | 44 +-
+ drivers/media/{video => platform}/mx2_emmaprp.c | 78 +-
+ drivers/media/{video => platform}/omap/Kconfig | 0
+ drivers/media/{video => platform}/omap/Makefile | 2 +-
+ drivers/media/{video => platform}/omap/omap_vout.c | 5 +-
+ .../{video => platform}/omap/omap_vout_vrfb.c | 0
+ .../{video => platform}/omap/omap_vout_vrfb.h | 0
+ .../media/{video => platform}/omap/omap_voutdef.h | 0
+ .../media/{video => platform}/omap/omap_voutlib.c | 0
+ .../media/{video => platform}/omap/omap_voutlib.h | 0
+ .../media/{video => platform}/omap24xxcam-dma.c | 2 +-
+ drivers/media/{video => platform}/omap24xxcam.c | 2 +-
+ drivers/media/{video => platform}/omap24xxcam.h | 2 +-
+ .../media/{video => platform}/omap3isp/Makefile | 0
+ .../{video => platform}/omap3isp/cfa_coef_table.h | 16 +-
+ .../{video => platform}/omap3isp/gamma_table.h | 0
+ drivers/media/{video => platform}/omap3isp/isp.c | 53 +-
+ drivers/media/{video => platform}/omap3isp/isp.h | 11 +-
+ .../media/{video => platform}/omap3isp/ispccdc.c | 238 +-
+ .../media/{video => platform}/omap3isp/ispccdc.h | 37 -
+ .../media/{video => platform}/omap3isp/ispccp2.c | 0
+ .../media/{video => platform}/omap3isp/ispccp2.h | 0
+ .../media/{video => platform}/omap3isp/ispcsi2.c | 27 +-
+ .../media/{video => platform}/omap3isp/ispcsi2.h | 0
+ .../media/{video => platform}/omap3isp/ispcsiphy.c | 0
+ .../media/{video => platform}/omap3isp/ispcsiphy.h | 0
+ .../media/{video => platform}/omap3isp/isph3a.h | 0
+ .../{video => platform}/omap3isp/isph3a_aewb.c | 10 +-
+ .../media/{video => platform}/omap3isp/isph3a_af.c | 10 +-
+ .../media/{video => platform}/omap3isp/isphist.c | 6 +-
+ .../media/{video => platform}/omap3isp/isphist.h | 0
+ .../{video => platform}/omap3isp/isppreview.c | 707 ++--
+ .../{video => platform}/omap3isp/isppreview.h | 1 +
+ .../media/{video => platform}/omap3isp/ispqueue.c | 15 +-
+ .../media/{video => platform}/omap3isp/ispqueue.h | 0
+ .../media/{video => platform}/omap3isp/ispreg.h | 0
+ .../{video => platform}/omap3isp/ispresizer.c | 8 +-
+ .../{video => platform}/omap3isp/ispresizer.h | 0
+ .../media/{video => platform}/omap3isp/ispstat.c | 4 +-
+ .../media/{video => platform}/omap3isp/ispstat.h | 4 +-
+ .../media/{video => platform}/omap3isp/ispvideo.c | 66 +-
+ .../media/{video => platform}/omap3isp/ispvideo.h | 6 +-
+ .../omap3isp/luma_enhance_table.h | 0
+ .../omap3isp/noise_filter_table.h | 0
+ drivers/media/{video => platform}/s5p-fimc/Kconfig | 2 +-
+ .../media/{video => platform}/s5p-fimc/Makefile | 0
+ .../{video => platform}/s5p-fimc/fimc-capture.c | 58 +-
+ .../media/{video => platform}/s5p-fimc/fimc-core.c | 0
+ .../media/{video => platform}/s5p-fimc/fimc-core.h | 7 +-
+ .../{video => platform}/s5p-fimc/fimc-lite-reg.c | 8 +-
+ .../{video => platform}/s5p-fimc/fimc-lite-reg.h | 0
+ .../media/{video => platform}/s5p-fimc/fimc-lite.c | 70 +-
+ .../media/{video => platform}/s5p-fimc/fimc-lite.h | 6 +-
+ .../media/{video => platform}/s5p-fimc/fimc-m2m.c | 47 +-
+ .../{video => platform}/s5p-fimc/fimc-mdevice.c | 79 +-
+ .../{video => platform}/s5p-fimc/fimc-mdevice.h | 14 +-
+ .../media/{video => platform}/s5p-fimc/fimc-reg.c | 6 +-
+ .../media/{video => platform}/s5p-fimc/fimc-reg.h | 0
+ .../media/{video => platform}/s5p-fimc/mipi-csis.c | 160 +-
+ .../media/{video => platform}/s5p-fimc/mipi-csis.h | 0
+ drivers/media/{video => platform}/s5p-g2d/Makefile | 0
+ drivers/media/{video => platform}/s5p-g2d/g2d-hw.c | 0
+ .../media/{video => platform}/s5p-g2d/g2d-regs.h | 0
+ drivers/media/{video => platform}/s5p-g2d/g2d.c | 32 +-
+ drivers/media/{video => platform}/s5p-g2d/g2d.h | 0
+ .../media/{video => platform}/s5p-jpeg/Makefile | 0
+ .../media/{video => platform}/s5p-jpeg/jpeg-core.c | 41 +-
+ .../media/{video => platform}/s5p-jpeg/jpeg-core.h | 2 +-
+ .../media/{video => platform}/s5p-jpeg/jpeg-hw.h | 2 +-
+ .../media/{video => platform}/s5p-jpeg/jpeg-regs.h | 2 +-
+ drivers/media/{video => platform}/s5p-mfc/Makefile | 0
+ .../media/{video => platform}/s5p-mfc/regs-mfc.h | 0
+ .../media/{video => platform}/s5p-mfc/s5p_mfc.c | 127 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_cmd.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_cmd.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_common.h | 10 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.c | 10 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_debug.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_dec.c | 34 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_dec.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_enc.c | 142 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_enc.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_intr.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_intr.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_opr.c | 50 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_opr.h | 2 +-
+ .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.c | 2 +-
+ .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_shm.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_shm.h | 2 +-
+ drivers/media/{video => platform}/s5p-tv/Kconfig | 2 +-
+ drivers/media/{video => platform}/s5p-tv/Makefile | 2 +-
+ .../media/{video => platform}/s5p-tv/hdmi_drv.c | 6 +-
+ .../media/{video => platform}/s5p-tv/hdmiphy_drv.c | 0
+ drivers/media/{video => platform}/s5p-tv/mixer.h | 0
+ .../media/{video => platform}/s5p-tv/mixer_drv.c | 8 +-
+ .../{video => platform}/s5p-tv/mixer_grp_layer.c | 0
+ .../media/{video => platform}/s5p-tv/mixer_reg.c | 0
+ .../media/{video => platform}/s5p-tv/mixer_video.c | 41 +-
+ .../{video => platform}/s5p-tv/mixer_vp_layer.c | 0
+ .../media/{video => platform}/s5p-tv/regs-hdmi.h | 0
+ .../media/{video => platform}/s5p-tv/regs-mixer.h | 0
+ .../media/{video => platform}/s5p-tv/regs-sdo.h | 2 +-
+ drivers/media/{video => platform}/s5p-tv/regs-vp.h | 0
+ drivers/media/{video => platform}/s5p-tv/sdo_drv.c | 10 +-
+ .../media/{video => platform}/s5p-tv/sii9234_drv.c | 17 +-
+ drivers/media/{video => platform}/sh_vou.c | 30 +-
+ drivers/media/platform/soc_camera/Kconfig | 87 +
+ drivers/media/platform/soc_camera/Makefile | 14 +
+ .../{video => platform/soc_camera}/atmel-isi.c | 0
+ .../{video => platform/soc_camera}/mx1_camera.c | 0
+ .../{video => platform/soc_camera}/mx2_camera.c | 193 +-
+ .../{video => platform/soc_camera}/mx3_camera.c | 4 +-
+ .../{video => platform/soc_camera}/omap1_camera.c | 2 +-
+ .../{video => platform/soc_camera}/pxa_camera.c | 0
+ .../soc_camera}/sh_mobile_ceu_camera.c | 4 +-
+ .../soc_camera}/sh_mobile_csi2.c | 0
+ .../{video => platform/soc_camera}/soc_camera.c | 205 +-
+ .../soc_camera}/soc_camera_platform.c | 11 +-
+ .../{video => platform/soc_camera}/soc_mediabus.c | 0
+ drivers/media/{video => platform}/timblogiw.c | 0
+ drivers/media/{video => platform}/via-camera.c | 0
+ drivers/media/{video => platform}/via-camera.h | 0
+ drivers/media/{video => platform}/vino.c | 2 +-
+ drivers/media/{video => platform}/vino.h | 0
+ drivers/media/{video => platform}/vivi.c | 56 +-
+ drivers/media/radio/radio-keene.c | 2 +-
+ drivers/media/radio/radio-miropcm20.c | 2 +-
+ drivers/media/radio/radio-mr800.c | 5 +-
+ drivers/media/radio/radio-sf16fmi.c | 2 +-
+ drivers/media/radio/radio-shark.c | 44 +-
+ drivers/media/radio/radio-shark2.c | 52 +-
+ drivers/media/radio/radio-si4713.c | 11 +-
+ drivers/media/radio/radio-tea5764.c | 15 +-
+ drivers/media/radio/radio-tea5777.c | 205 +-
+ drivers/media/radio/radio-tea5777.h | 3 +
+ drivers/media/radio/radio-timb.c | 10 +-
+ drivers/media/radio/radio-wl1273.c | 32 +-
+ drivers/media/radio/saa7706h.c | 15 +-
+ drivers/media/radio/si470x/radio-si470x-common.c | 7 +-
+ drivers/media/radio/si470x/radio-si470x-i2c.c | 23 +-
+ drivers/media/radio/si4713-i2c.c | 4 +-
+ drivers/media/radio/wl128x/fmdrv_v4l2.c | 47 +-
+ drivers/media/rc/Kconfig | 32 +-
+ drivers/media/rc/Makefile | 2 +
+ drivers/media/rc/ati_remote.c | 15 +-
+ drivers/media/rc/fintek-cir.c | 11 +-
+ drivers/media/rc/iguanair.c | 247 +-
+ drivers/media/rc/ir-lirc-codec.c | 35 +-
+ drivers/media/rc/ir-nec-decoder.c | 4 +-
+ drivers/media/rc/ir-raw.c | 6 +-
+ drivers/media/rc/ir-rx51.c | 498 +++
+ drivers/media/rc/ite-cir.c | 2 +-
+ drivers/media/rc/keymaps/rc-tt-1500.c | 2 +-
+ drivers/media/rc/mceusb.c | 30 +-
+ drivers/media/rc/rc-loopback.c | 12 -
+ drivers/media/rc/redrat3.c | 5 +-
+ drivers/media/rc/ttusbir.c | 447 +++
+ drivers/media/rc/winbond-cir.c | 49 +-
+ drivers/media/{common => }/tuners/Kconfig | 105 +-
+ drivers/media/{common => }/tuners/Makefile | 6 +-
+ drivers/media/tuners/e4000.c | 409 ++
+ drivers/media/tuners/e4000.h | 52 +
+ drivers/media/tuners/e4000_priv.h | 147 +
+ drivers/media/{common => }/tuners/fc0011.c | 0
+ drivers/media/{common => }/tuners/fc0011.h | 0
+ drivers/media/{common => }/tuners/fc0012-priv.h | 0
+ drivers/media/{common => }/tuners/fc0012.c | 0
+ drivers/media/{common => }/tuners/fc0012.h | 0
+ drivers/media/{common => }/tuners/fc0013-priv.h | 0
+ drivers/media/{common => }/tuners/fc0013.c | 0
+ drivers/media/{common => }/tuners/fc0013.h | 0
+ drivers/media/{common => }/tuners/fc001x-common.h | 0
+ drivers/media/tuners/fc2580.c | 529 +++
+ drivers/media/tuners/fc2580.h | 52 +
+ drivers/media/tuners/fc2580_priv.h | 134 +
+ drivers/media/{common => }/tuners/max2165.c | 0
+ drivers/media/{common => }/tuners/max2165.h | 0
+ drivers/media/{common => }/tuners/max2165_priv.h | 0
+ drivers/media/{common => }/tuners/mc44s803.c | 9 +-
+ drivers/media/{common => }/tuners/mc44s803.h | 0
+ drivers/media/{common => }/tuners/mc44s803_priv.h | 0
+ drivers/media/{common => }/tuners/mt2060.c | 0
+ drivers/media/{common => }/tuners/mt2060.h | 0
+ drivers/media/{common => }/tuners/mt2060_priv.h | 0
+ drivers/media/{common => }/tuners/mt2063.c | 0
+ drivers/media/{common => }/tuners/mt2063.h | 0
+ drivers/media/{common => }/tuners/mt20xx.c | 0
+ drivers/media/{common => }/tuners/mt20xx.h | 0
+ drivers/media/{common => }/tuners/mt2131.c | 0
+ drivers/media/{common => }/tuners/mt2131.h | 0
+ drivers/media/{common => }/tuners/mt2131_priv.h | 0
+ drivers/media/{common => }/tuners/mt2266.c | 0
+ drivers/media/{common => }/tuners/mt2266.h | 0
+ drivers/media/{common => }/tuners/mxl5005s.c | 11 +
+ drivers/media/{common => }/tuners/mxl5005s.h | 0
+ drivers/media/{common => }/tuners/mxl5007t.c | 0
+ drivers/media/{common => }/tuners/mxl5007t.h | 0
+ drivers/media/{common => }/tuners/qt1010.c | 66 +-
+ drivers/media/{common => }/tuners/qt1010.h | 0
+ drivers/media/{common => }/tuners/qt1010_priv.h | 0
+ drivers/media/{common => }/tuners/tda18212.c | 37 +-
+ drivers/media/{common => }/tuners/tda18212.h | 0
+ drivers/media/{common => }/tuners/tda18218.c | 52 +-
+ drivers/media/{common => }/tuners/tda18218.h | 0
+ drivers/media/{common => }/tuners/tda18218_priv.h | 13 +-
+ .../media/{common => }/tuners/tda18271-common.c | 10 +-
+ drivers/media/{common => }/tuners/tda18271-fe.c | 19 +-
+ drivers/media/{common => }/tuners/tda18271-maps.c | 0
+ drivers/media/{common => }/tuners/tda18271-priv.h | 0
+ drivers/media/{common => }/tuners/tda18271.h | 5 +
+ drivers/media/{common => }/tuners/tda827x.c | 0
+ drivers/media/{common => }/tuners/tda827x.h | 0
+ drivers/media/{common => }/tuners/tda8290.c | 0
+ drivers/media/{common => }/tuners/tda8290.h | 0
+ drivers/media/{common => }/tuners/tda9887.c | 0
+ drivers/media/{common => }/tuners/tda9887.h | 0
+ drivers/media/{common => }/tuners/tea5761.c | 0
+ drivers/media/{common => }/tuners/tea5761.h | 0
+ drivers/media/{common => }/tuners/tea5767.c | 0
+ drivers/media/{common => }/tuners/tea5767.h | 0
+ drivers/media/{common => }/tuners/tua9001.c | 105 +-
+ drivers/media/{common => }/tuners/tua9001.h | 20 +
+ drivers/media/{common => }/tuners/tua9001_priv.h | 0
+ drivers/media/{common => }/tuners/tuner-i2c.h | 0
+ drivers/media/{common => }/tuners/tuner-simple.c | 0
+ drivers/media/{common => }/tuners/tuner-simple.h | 0
+ drivers/media/{common => }/tuners/tuner-types.c | 0
+ .../media/{common => }/tuners/tuner-xc2028-types.h | 0
+ drivers/media/{common => }/tuners/tuner-xc2028.c | 7 +-
+ drivers/media/{common => }/tuners/tuner-xc2028.h | 0
+ drivers/media/{common => }/tuners/xc4000.c | 3 +-
+ drivers/media/{common => }/tuners/xc4000.h | 0
+ drivers/media/{common => }/tuners/xc5000.c | 161 +-
+ drivers/media/{common => }/tuners/xc5000.h | 0
+ drivers/media/usb/Kconfig | 54 +
+ drivers/media/usb/Makefile | 22 +
+ drivers/media/{video => usb}/au0828/Kconfig | 11 +-
+ drivers/media/{video => usb}/au0828/Makefile | 6 +-
+ drivers/media/{video => usb}/au0828/au0828-cards.c | 4 +-
+ drivers/media/{video => usb}/au0828/au0828-cards.h | 0
+ drivers/media/{video => usb}/au0828/au0828-core.c | 59 +-
+ drivers/media/{video => usb}/au0828/au0828-dvb.c | 54 +-
+ drivers/media/{video => usb}/au0828/au0828-i2c.c | 21 +-
+ drivers/media/{video => usb}/au0828/au0828-reg.h | 1 +
+ drivers/media/{video => usb}/au0828/au0828-vbi.c | 0
+ drivers/media/{video => usb}/au0828/au0828-video.c | 78 +-
+ drivers/media/{video => usb}/au0828/au0828.h | 2 +
+ drivers/media/usb/b2c2/Kconfig | 15 +
+ drivers/media/usb/b2c2/Makefile | 5 +
+ drivers/media/{dvb => usb}/b2c2/flexcop-usb.c | 5 +-
+ drivers/media/{dvb => usb}/b2c2/flexcop-usb.h | 0
+ drivers/media/{video => usb}/cpia2/Kconfig | 0
+ drivers/media/{video => usb}/cpia2/Makefile | 0
+ drivers/media/{video => usb}/cpia2/cpia2.h | 0
+ drivers/media/{video => usb}/cpia2/cpia2_core.c | 6 +-
+ .../media/{video => usb}/cpia2/cpia2_registers.h | 0
+ drivers/media/{video => usb}/cpia2/cpia2_usb.c | 0
+ drivers/media/{video => usb}/cpia2/cpia2_v4l.c | 44 +-
+ drivers/media/{video => usb}/cx231xx/Kconfig | 8 +-
+ drivers/media/{video => usb}/cx231xx/Makefile | 11 +-
+ drivers/media/{video => usb}/cx231xx/cx231xx-417.c | 2 +
+ .../media/{video => usb}/cx231xx/cx231xx-audio.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-avcore.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-cards.c | 0
+ .../{video => usb}/cx231xx/cx231xx-conf-reg.h | 0
+ .../media/{video => usb}/cx231xx/cx231xx-core.c | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-dif.h | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-input.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-reg.h | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h | 0
+ .../media/{video => usb}/cx231xx/cx231xx-video.c | 51 +-
+ drivers/media/{video => usb}/cx231xx/cx231xx.h | 0
+ drivers/media/usb/dvb-usb-v2/Kconfig | 149 +
+ drivers/media/usb/dvb-usb-v2/Makefile | 49 +
+ drivers/media/usb/dvb-usb-v2/af9015.c | 1454 +++++++
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h | 55 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c | 884 ++--
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h | 10 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c | 671 ++--
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h | 10 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c | 123 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h | 13 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c | 410 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c | 188 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h | 33 +-
+ drivers/media/usb/dvb-usb-v2/cypress_firmware.c | 134 +
+ drivers/media/usb/dvb-usb-v2/cypress_firmware.h | 31 +
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 403 ++
+ drivers/media/usb/dvb-usb-v2/dvb_usb_common.h | 35 +
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1049 +++++
+ drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 77 +
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c | 326 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h | 24 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c | 132 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h | 5 +-
+ drivers/media/usb/dvb-usb-v2/it913x.c | 799 ++++
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c | 586 ++-
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c | 2 +
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h | 0
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 1431 +++++++
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h | 22 +-
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c | 1196 +++---
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h | 29 +-
+ drivers/media/usb/dvb-usb-v2/usb_urb.c | 358 ++
+ drivers/media/usb/dvb-usb/Kconfig | 313 ++
+ drivers/media/usb/dvb-usb/Makefile | 83 +
+ drivers/media/{dvb => usb}/dvb-usb/a800.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005-script.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/az6027.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/az6027.h | 0
+ .../media/{dvb => usb}/dvb-usb/cinergyT2-core.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/cxusb.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/cxusb.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dib0700.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c | 6 +-
+ .../media/{dvb => usb}/dvb-usb/dib0700_devices.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dib07x0.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dibusb.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/digitv.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/digitv.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtt200u.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtt200u.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtv5100.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtv5100.h | 0
+ .../media/{dvb => usb}/dvb-usb/dvb-usb-common.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c | 1 -
+ .../media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c | 0
+ .../media/{dvb => usb}/dvb-usb/dvb-usb-remote.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h | 2 -
+ drivers/media/{dvb => usb}/dvb-usb/dw2102.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dw2102.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/friio-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/friio.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/friio.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/gp8psk.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/gp8psk.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/m920x.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/m920x.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/opera1.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/pctv452e.c | 7 +-
+ .../media/{dvb => usb}/dvb-usb/technisat-usb2.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/ttusb2.c | 2 +-
+ drivers/media/{dvb => usb}/dvb-usb/ttusb2.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/umt-010.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/usb-urb.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp702x.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp702x.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp7045.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp7045.h | 0
+ drivers/media/{video => usb}/em28xx/Kconfig | 28 +-
+ drivers/media/{video => usb}/em28xx/Makefile | 10 +-
+ drivers/media/{video => usb}/em28xx/em28xx-audio.c | 1 -
+ drivers/media/{video => usb}/em28xx/em28xx-cards.c | 22 +-
+ drivers/media/{video => usb}/em28xx/em28xx-core.c | 4 -
+ drivers/media/{video => usb}/em28xx/em28xx-dvb.c | 60 +-
+ drivers/media/{video => usb}/em28xx/em28xx-i2c.c | 0
+ drivers/media/{video => usb}/em28xx/em28xx-input.c | 0
+ drivers/media/{video => usb}/em28xx/em28xx-reg.h | 0
+ drivers/media/{video => usb}/em28xx/em28xx-vbi.c | 0
+ drivers/media/{video => usb}/em28xx/em28xx-video.c | 56 +-
+ drivers/media/{video => usb}/em28xx/em28xx.h | 0
+ drivers/media/{video => usb}/gspca/Kconfig | 6 +-
+ drivers/media/{video => usb}/gspca/Makefile | 0
+ .../{video => usb}/gspca/autogain_functions.c | 0
+ .../{video => usb}/gspca/autogain_functions.h | 0
+ drivers/media/{video => usb}/gspca/benq.c | 0
+ drivers/media/{video => usb}/gspca/conex.c | 0
+ drivers/media/{video => usb}/gspca/cpia1.c | 2 +-
+ drivers/media/{video => usb}/gspca/etoms.c | 0
+ drivers/media/{video => usb}/gspca/finepix.c | 18 +-
+ drivers/media/{video => usb}/gspca/gl860/Kconfig | 0
+ drivers/media/{video => usb}/gspca/gl860/Makefile | 2 +-
+ .../{video => usb}/gspca/gl860/gl860-mi1320.c | 0
+ .../{video => usb}/gspca/gl860/gl860-mi2020.c | 0
+ .../{video => usb}/gspca/gl860/gl860-ov2640.c | 0
+ .../{video => usb}/gspca/gl860/gl860-ov9655.c | 0
+ drivers/media/{video => usb}/gspca/gl860/gl860.c | 0
+ drivers/media/{video => usb}/gspca/gl860/gl860.h | 0
+ drivers/media/{video => usb}/gspca/gspca.c | 14 +-
+ drivers/media/{video => usb}/gspca/gspca.h | 8 +-
+ drivers/media/{video => usb}/gspca/jeilinj.c | 2 +-
+ drivers/media/{video => usb}/gspca/jl2005bcd.c | 18 +-
+ drivers/media/{video => usb}/gspca/jpeg.h | 0
+ drivers/media/{video => usb}/gspca/kinect.c | 0
+ drivers/media/{video => usb}/gspca/konica.c | 0
+ drivers/media/{video => usb}/gspca/m5602/Kconfig | 0
+ drivers/media/{video => usb}/gspca/m5602/Makefile | 2 +-
+ .../{video => usb}/gspca/m5602/m5602_bridge.h | 0
+ .../media/{video => usb}/gspca/m5602/m5602_core.c | 0
+ .../{video => usb}/gspca/m5602/m5602_mt9m111.c | 0
+ .../{video => usb}/gspca/m5602/m5602_mt9m111.h | 0
+ .../{video => usb}/gspca/m5602/m5602_ov7660.c | 0
+ .../{video => usb}/gspca/m5602/m5602_ov7660.h | 0
+ .../{video => usb}/gspca/m5602/m5602_ov9650.c | 0
+ .../{video => usb}/gspca/m5602/m5602_ov9650.h | 0
+ .../{video => usb}/gspca/m5602/m5602_po1030.c | 0
+ .../{video => usb}/gspca/m5602/m5602_po1030.h | 0
+ .../{video => usb}/gspca/m5602/m5602_s5k4aa.c | 0
+ .../{video => usb}/gspca/m5602/m5602_s5k4aa.h | 0
+ .../{video => usb}/gspca/m5602/m5602_s5k83a.c | 0
+ .../{video => usb}/gspca/m5602/m5602_s5k83a.h | 0
+ .../{video => usb}/gspca/m5602/m5602_sensor.h | 0
+ drivers/media/{video => usb}/gspca/mars.c | 0
+ drivers/media/{video => usb}/gspca/mr97310a.c | 0
+ drivers/media/{video => usb}/gspca/nw80x.c | 0
+ drivers/media/{video => usb}/gspca/ov519.c | 18 +-
+ drivers/media/{video => usb}/gspca/ov534.c | 0
+ drivers/media/{video => usb}/gspca/ov534_9.c | 0
+ drivers/media/{video => usb}/gspca/pac207.c | 0
+ drivers/media/{video => usb}/gspca/pac7302.c | 47 +-
+ drivers/media/{video => usb}/gspca/pac7311.c | 0
+ drivers/media/{video => usb}/gspca/pac_common.h | 0
+ drivers/media/{video => usb}/gspca/se401.c | 0
+ drivers/media/{video => usb}/gspca/se401.h | 0
+ drivers/media/{video => usb}/gspca/sn9c2028.c | 0
+ drivers/media/{video => usb}/gspca/sn9c2028.h | 0
+ drivers/media/{video => usb}/gspca/sn9c20x.c | 2 +
+ drivers/media/{video => usb}/gspca/sonixb.c | 0
+ drivers/media/{video => usb}/gspca/sonixj.c | 2 +
+ drivers/media/{video => usb}/gspca/spca1528.c | 0
+ drivers/media/{video => usb}/gspca/spca500.c | 0
+ drivers/media/{video => usb}/gspca/spca501.c | 0
+ drivers/media/{video => usb}/gspca/spca505.c | 0
+ drivers/media/{video => usb}/gspca/spca506.c | 0
+ drivers/media/{video => usb}/gspca/spca508.c | 0
+ drivers/media/{video => usb}/gspca/spca561.c | 0
+ drivers/media/{video => usb}/gspca/sq905.c | 19 +-
+ drivers/media/{video => usb}/gspca/sq905c.c | 25 +-
+ drivers/media/{video => usb}/gspca/sq930x.c | 10 +-
+ drivers/media/{video => usb}/gspca/stk014.c | 0
+ drivers/media/{video => usb}/gspca/stv0680.c | 0
+ drivers/media/{video => usb}/gspca/stv06xx/Kconfig | 0
+ .../media/{video => usb}/gspca/stv06xx/Makefile | 2 +-
+ .../media/{video => usb}/gspca/stv06xx/stv06xx.c | 0
+ .../media/{video => usb}/gspca/stv06xx/stv06xx.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.c | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.c | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_sensor.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_st6422.c | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_st6422.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.c | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.h | 0
+ drivers/media/{video => usb}/gspca/sunplus.c | 0
+ drivers/media/{video => usb}/gspca/t613.c | 0
+ drivers/media/{video => usb}/gspca/topro.c | 2 +-
+ drivers/media/{video => usb}/gspca/tv8532.c | 0
+ drivers/media/{video => usb}/gspca/vc032x.c | 7 +-
+ drivers/media/{video => usb}/gspca/vicam.c | 17 +-
+ drivers/media/{video => usb}/gspca/w996Xcf.c | 0
+ drivers/media/{video => usb}/gspca/xirlink_cit.c | 4 +-
+ drivers/media/{video => usb}/gspca/zc3xx-reg.h | 0
+ drivers/media/{video => usb}/gspca/zc3xx.c | 17 +-
+ drivers/media/{video => usb}/hdpvr/Kconfig | 0
+ drivers/media/{video => usb}/hdpvr/Makefile | 2 +-
+ drivers/media/{video => usb}/hdpvr/hdpvr-control.c | 0
+ drivers/media/{video => usb}/hdpvr/hdpvr-core.c | 0
+ drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c | 0
+ drivers/media/{video => usb}/hdpvr/hdpvr-video.c | 2 +-
+ drivers/media/{video => usb}/hdpvr/hdpvr.h | 0
+ drivers/media/{video => usb}/pvrusb2/Kconfig | 14 +-
+ drivers/media/{video => usb}/pvrusb2/Makefile | 8 +-
+ .../media/{video => usb}/pvrusb2/pvrusb2-audio.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-audio.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-context.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-context.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-debug.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-debugifc.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-debugifc.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-devattr.c | 17 +-
+ .../media/{video => usb}/pvrusb2/pvrusb2-devattr.h | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-encoder.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-encoder.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-hdw-internal.h | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-i2c-core.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-i2c-core.h | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-ioread.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-ioread.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-main.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-util.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.c | 4 +-
+ .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-video-v4l.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-video-v4l.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.h | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2.h | 0
+ drivers/media/{video => usb}/pwc/Kconfig | 0
+ drivers/media/{video => usb}/pwc/Makefile | 2 +-
+ drivers/media/{video => usb}/pwc/philips.txt | 0
+ drivers/media/{video => usb}/pwc/pwc-ctrl.c | 0
+ drivers/media/{video => usb}/pwc/pwc-dec1.c | 0
+ drivers/media/{video => usb}/pwc/pwc-dec1.h | 0
+ drivers/media/{video => usb}/pwc/pwc-dec23.c | 0
+ drivers/media/{video => usb}/pwc/pwc-dec23.h | 0
+ drivers/media/{video => usb}/pwc/pwc-if.c | 3 +-
+ drivers/media/{video => usb}/pwc/pwc-kiara.c | 0
+ drivers/media/{video => usb}/pwc/pwc-kiara.h | 0
+ drivers/media/{video => usb}/pwc/pwc-misc.c | 0
+ drivers/media/{video => usb}/pwc/pwc-nala.h | 0
+ drivers/media/{video => usb}/pwc/pwc-timon.c | 0
+ drivers/media/{video => usb}/pwc/pwc-timon.h | 0
+ drivers/media/{video => usb}/pwc/pwc-uncompress.c | 0
+ drivers/media/{video => usb}/pwc/pwc-v4l.c | 0
+ drivers/media/{video => usb}/pwc/pwc.h | 0
+ drivers/media/usb/s2255/Kconfig | 9 +
+ drivers/media/usb/s2255/Makefile | 2 +
+ drivers/media/{video => usb/s2255}/s2255drv.c | 45 +-
+ drivers/media/usb/siano/Kconfig | 10 +
+ drivers/media/usb/siano/Makefile | 6 +
+ drivers/media/{dvb => usb}/siano/smsusb.c | 0
+ drivers/media/{video => usb}/sn9c102/Kconfig | 0
+ drivers/media/{video => usb}/sn9c102/Makefile | 0
+ drivers/media/{video => usb}/sn9c102/sn9c102.h | 0
+ .../media/{video => usb}/sn9c102/sn9c102_config.h | 0
+ .../media/{video => usb}/sn9c102/sn9c102_core.c | 0
+ .../{video => usb}/sn9c102/sn9c102_devtable.h | 0
+ .../media/{video => usb}/sn9c102/sn9c102_hv7131d.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_hv7131r.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_mi0343.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_mi0360.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_mt9v111.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_ov7630.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_ov7660.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_pas106b.c | 0
+ .../{video => usb}/sn9c102/sn9c102_pas202bcb.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_sensor.h | 0
+ .../{video => usb}/sn9c102/sn9c102_tas5110c1b.c | 0
+ .../{video => usb}/sn9c102/sn9c102_tas5110d.c | 0
+ .../{video => usb}/sn9c102/sn9c102_tas5130d1b.c | 0
+ drivers/media/usb/stk1160/Kconfig | 20 +
+ drivers/media/usb/stk1160/Makefile | 11 +
+ drivers/media/usb/stk1160/stk1160-ac97.c | 152 +
+ drivers/media/usb/stk1160/stk1160-core.c | 430 ++
+ drivers/media/usb/stk1160/stk1160-i2c.c | 294 ++
+ drivers/media/usb/stk1160/stk1160-reg.h | 93 +
+ drivers/media/usb/stk1160/stk1160-v4l.c | 739 ++++
+ drivers/media/usb/stk1160/stk1160-video.c | 522 +++
+ drivers/media/usb/stk1160/stk1160.h | 208 +
+ drivers/media/usb/stkwebcam/Kconfig | 13 +
+ drivers/media/usb/stkwebcam/Makefile | 4 +
+ .../media/{video => usb/stkwebcam}/stk-sensor.c | 0
+ .../media/{video => usb/stkwebcam}/stk-webcam.c | 0
+ .../media/{video => usb/stkwebcam}/stk-webcam.h | 0
+ drivers/media/{video => usb}/tlg2300/Kconfig | 0
+ drivers/media/usb/tlg2300/Makefile | 9 +
+ drivers/media/{video => usb}/tlg2300/pd-alsa.c | 4 +
+ drivers/media/{video => usb}/tlg2300/pd-common.h | 0
+ drivers/media/{video => usb}/tlg2300/pd-dvb.c | 0
+ drivers/media/{video => usb}/tlg2300/pd-main.c | 0
+ drivers/media/{video => usb}/tlg2300/pd-radio.c | 2 +-
+ drivers/media/{video => usb}/tlg2300/pd-video.c | 2 +-
+ drivers/media/{video => usb}/tlg2300/vendorcmds.h | 0
+ drivers/media/{video => usb}/tm6000/Kconfig | 0
+ drivers/media/{video => usb}/tm6000/Makefile | 8 +-
+ drivers/media/{video => usb}/tm6000/tm6000-alsa.c | 3 +-
+ drivers/media/{video => usb}/tm6000/tm6000-cards.c | 0
+ drivers/media/{video => usb}/tm6000/tm6000-core.c | 0
+ drivers/media/{video => usb}/tm6000/tm6000-dvb.c | 0
+ drivers/media/{video => usb}/tm6000/tm6000-i2c.c | 0
+ drivers/media/{video => usb}/tm6000/tm6000-input.c | 3 +-
+ drivers/media/{video => usb}/tm6000/tm6000-regs.h | 0
+ drivers/media/{video => usb}/tm6000/tm6000-stds.c | 0
+ .../media/{video => usb}/tm6000/tm6000-usb-isoc.h | 0
+ drivers/media/{video => usb}/tm6000/tm6000-video.c | 54 +-
+ drivers/media/{video => usb}/tm6000/tm6000.h | 0
+ drivers/media/{dvb => usb}/ttusb-budget/Kconfig | 14 +-
+ drivers/media/usb/ttusb-budget/Makefile | 3 +
+ .../{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c | 0
+ drivers/media/{dvb => usb}/ttusb-dec/Kconfig | 0
+ drivers/media/{dvb => usb}/ttusb-dec/Makefile | 2 +-
+ drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c | 0
+ drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c | 0
+ drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h | 0
+ drivers/media/{video => usb}/usbvision/Kconfig | 2 +-
+ drivers/media/{video => usb}/usbvision/Makefile | 4 +-
+ .../{video => usb}/usbvision/usbvision-cards.c | 0
+ .../{video => usb}/usbvision/usbvision-cards.h | 0
+ .../{video => usb}/usbvision/usbvision-core.c | 0
+ .../media/{video => usb}/usbvision/usbvision-i2c.c | 0
+ .../{video => usb}/usbvision/usbvision-video.c | 44 +-
+ drivers/media/{video => usb}/usbvision/usbvision.h | 0
+ drivers/media/{video => usb}/uvc/Kconfig | 0
+ drivers/media/{video => usb}/uvc/Makefile | 0
+ drivers/media/{video => usb}/uvc/uvc_ctrl.c | 0
+ drivers/media/{video => usb}/uvc/uvc_debugfs.c | 0
+ drivers/media/{video => usb}/uvc/uvc_driver.c | 42 +-
+ drivers/media/{video => usb}/uvc/uvc_entity.c | 0
+ drivers/media/{video => usb}/uvc/uvc_isight.c | 0
+ drivers/media/{video => usb}/uvc/uvc_queue.c | 0
+ drivers/media/{video => usb}/uvc/uvc_status.c | 0
+ drivers/media/{video => usb}/uvc/uvc_v4l2.c | 0
+ drivers/media/{video => usb}/uvc/uvc_video.c | 30 +-
+ drivers/media/{video => usb}/uvc/uvcvideo.h | 9 +
+ drivers/media/usb/zr364xx/Kconfig | 14 +
+ drivers/media/usb/zr364xx/Makefile | 2 +
+ drivers/media/{video => usb/zr364xx}/zr364xx.c | 0
+ drivers/media/v4l2-core/Kconfig | 81 +
+ drivers/media/v4l2-core/Makefile | 35 +
+ drivers/media/{video => v4l2-core}/tuner-core.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-common.c | 362 +-
+ .../{video => v4l2-core}/v4l2-compat-ioctl32.c | 65 +-
+ drivers/media/{video => v4l2-core}/v4l2-ctrls.c | 201 +-
+ drivers/media/{video => v4l2-core}/v4l2-dev.c | 277 +-
+ drivers/media/{video => v4l2-core}/v4l2-device.c | 2 +-
+ drivers/media/{video => v4l2-core}/v4l2-event.c | 4 +-
+ drivers/media/{video => v4l2-core}/v4l2-fh.c | 0
+ .../media/{video => v4l2-core}/v4l2-int-device.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-ioctl.c | 242 +-
+ drivers/media/{video => v4l2-core}/v4l2-mem2mem.c | 6 +-
+ drivers/media/{video => v4l2-core}/v4l2-subdev.c | 6 +
+ drivers/media/{video => v4l2-core}/videobuf-core.c | 0
+ .../{video => v4l2-core}/videobuf-dma-contig.c | 0
+ .../media/{video => v4l2-core}/videobuf-dma-sg.c | 0
+ drivers/media/{video => v4l2-core}/videobuf-dvb.c | 11 +-
+ .../media/{video => v4l2-core}/videobuf-vmalloc.c | 0
+ .../media/{video => v4l2-core}/videobuf2-core.c | 44 +-
+ .../{video => v4l2-core}/videobuf2-dma-contig.c | 0
+ .../media/{video => v4l2-core}/videobuf2-dma-sg.c | 0
+ .../media/{video => v4l2-core}/videobuf2-memops.c | 0
+ .../media/{video => v4l2-core}/videobuf2-vmalloc.c | 1 +
+ drivers/media/video/Kconfig | 1263 ------
+ drivers/media/video/Makefile | 218 -
+ drivers/media/video/bt8xx/Kconfig | 27 -
+ drivers/media/video/bt8xx/Makefile | 13 -
+ drivers/media/video/cx23885/Kconfig | 46 -
+ drivers/media/video/tlg2300/Makefile | 9 -
+ drivers/mfd/88pm860x-core.c | 827 ++--
+ drivers/mfd/88pm860x-i2c.c | 174 +-
+ drivers/mfd/Kconfig | 75 +-
+ drivers/mfd/Makefile | 12 +-
+ drivers/mfd/ab3100-core.c | 1 +
+ drivers/mfd/ab8500-core.c | 37 +-
+ drivers/mfd/anatop-mfd.c | 124 -
+ drivers/mfd/arizona-irq.c | 56 +-
+ drivers/mfd/da9055-core.c | 423 ++
+ drivers/mfd/da9055-i2c.c | 93 +
+ drivers/mfd/db8500-prcmu.c | 47 +-
+ drivers/mfd/lp8788-irq.c | 198 +
+ drivers/mfd/lp8788.c | 245 ++
+ drivers/mfd/lpc_ich.c | 43 +-
+ drivers/mfd/max8907.c | 351 ++
+ drivers/mfd/max8925-core.c | 427 +-
+ drivers/mfd/mc13xxx-core.c | 1 -
+ drivers/mfd/omap-usb-host.c | 238 +-
+ drivers/mfd/omap-usb-tll.c | 471 +++
+ drivers/mfd/palmas.c | 149 +-
+ drivers/mfd/rc5t583-irq.c | 2 +-
+ drivers/mfd/rc5t583.c | 2 +-
+ drivers/mfd/smsc-ece1099.c | 113 +
+ drivers/mfd/syscon.c | 176 +
+ drivers/mfd/tc3589x.c | 112 +-
+ drivers/mfd/tps65090.c | 2 +-
+ drivers/mfd/tps65217.c | 3 +
+ drivers/mfd/tps6586x.c | 19 +
+ drivers/mfd/tps65910.c | 32 +
+ drivers/mfd/twl-core.c | 156 +-
+ drivers/mfd/twl4030-audio.c | 105 +-
+ drivers/mfd/twl6040-core.c | 17 +-
+ drivers/mfd/wm5110-tables.c | 96 +-
+ drivers/mfd/wm831x-core.c | 66 +-
+ drivers/mfd/wm8994-core.c | 8 +-
+ drivers/mfd/wm8994-regmap.c | 2 +-
+ drivers/mmc/host/sdhci-pci.c | 2 +-
+ drivers/mtd/nand/fsl_ifc_nand.c | 56 +-
+ drivers/net/bonding/bond_main.c | 2 +
+ drivers/net/can/mscan/mpc5xxx_can.c | 8 +-
+ drivers/net/can/sja1000/peak_pci.c | 2 +
+ drivers/net/can/sja1000/peak_pcmcia.c | 4 +-
+ drivers/net/can/slcan.c | 2 +-
+ drivers/net/can/vcan.c | 2 +-
+ drivers/net/ethernet/8390/ne3210.c | 2 +-
+ drivers/net/ethernet/adaptec/starfire.c | 2 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 17 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 5 +-
+ drivers/net/ethernet/broadcom/tg3.c | 11 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 43 +-
+ drivers/net/ethernet/dec/tulip/de2104x.c | 7 +-
+ drivers/net/ethernet/dec/tulip/eeprom.c | 2 +-
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 7 +-
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +-
+ drivers/net/ethernet/dlink/sundance.c | 2 +-
+ drivers/net/ethernet/fealnx.c | 2 +-
+ drivers/net/ethernet/ibm/ehea/ehea.h | 1 -
+ drivers/net/ethernet/ibm/ehea/ehea_phyp.c | 12 +-
+ drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 14 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 1 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 5 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 15 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 202 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +
+ drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +-
+ drivers/net/ethernet/realtek/8139too.c | 2 +-
+ drivers/net/ethernet/sfc/efx.c | 4 +-
+ drivers/net/ethernet/sfc/net_driver.h | 12 -
+ drivers/net/ethernet/sfc/nic.c | 4 +-
+ drivers/net/ethernet/sis/sis190.c | 2 +-
+ drivers/net/ethernet/ti/davinci_cpdma.c | 1 +
+ drivers/net/hamradio/6pack.c | 6 +-
+ drivers/net/hamradio/bpqether.c | 2 +-
+ drivers/net/hamradio/mkiss.c | 6 +-
+ drivers/net/hamradio/scc.c | 2 +-
+ drivers/net/hamradio/yam.c | 2 +-
+ drivers/net/rionet.c | 141 +-
+ drivers/net/team/team.c | 2 +
+ drivers/net/wan/z85230.c | 2 +-
+ drivers/net/xen-netback/netback.c | 1 +
+ drivers/net/xen-netfront.c | 1 +
+ drivers/pci/hotplug/rpadlpar_core.c | 2 +-
+ drivers/pinctrl/Kconfig | 22 +
+ drivers/pinctrl/Makefile | 5 +
+ drivers/pinctrl/pinctrl-armada-370.c | 421 ++
+ drivers/pinctrl/pinctrl-armada-xp.c | 468 +++
+ drivers/pinctrl/pinctrl-dove.c | 620 +++
+ drivers/pinctrl/pinctrl-kirkwood.c | 472 +++
+ drivers/pinctrl/pinctrl-mvebu.c | 754 ++++
+ drivers/pinctrl/pinctrl-mvebu.h | 192 +
+ drivers/platform/x86/amilo-rfkill.c | 2 +-
+ drivers/platform/x86/fujitsu-tablet.c | 10 +-
+ drivers/platform/x86/hp_accel.c | 25 +-
+ drivers/platform/x86/ideapad-laptop.c | 14 +-
+ drivers/platform/x86/thinkpad_acpi.c | 2 +-
+ drivers/platform/x86/topstar-laptop.c | 22 +-
+ drivers/platform/x86/toshiba_bluetooth.c | 22 +-
+ drivers/platform/x86/xo15-ebook.c | 14 +-
+ drivers/pnp/pnpacpi/core.c | 7 +-
+ drivers/power/88pm860x_battery.c | 1041 +++++
+ drivers/power/88pm860x_charger.c | 746 ++++
+ drivers/power/Kconfig | 20 +-
+ drivers/power/Makefile | 3 +
+ drivers/power/ab8500_btemp.c | 1 +
+ drivers/power/ab8500_charger.c | 1 +
+ drivers/power/ab8500_fg.c | 1 +
+ drivers/power/bq27x00_battery.c | 3 +-
+ drivers/power/charger-manager.c | 434 +-
+ drivers/power/da9030_battery.c | 4 +-
+ drivers/power/da9052-battery.c | 11 +-
+ drivers/power/ds2781_battery.c | 28 +-
+ drivers/power/lp8727_charger.c | 360 +-
+ drivers/power/lp8788-charger.c | 795 ++++
+ drivers/power/pda_power.c | 13 +-
+ drivers/power/power_supply_sysfs.c | 3 +
+ drivers/power/sbs-battery.c | 10 +
+ drivers/power/smb347-charger.c | 97 +-
+ drivers/power/twl4030_charger.c | 25 +-
+ drivers/power/wm97xx_battery.c | 4 +-
+ drivers/pps/pps.c | 2 +-
+ drivers/pwm/Kconfig | 9 +
+ drivers/pwm/Makefile | 1 +
+ drivers/{mfd/twl6030-pwm.c => pwm/pwm-twl6030.c} | 119 +-
+ drivers/rapidio/devices/tsi721.c | 94 +-
+ drivers/rapidio/devices/tsi721.h | 15 +-
+ drivers/rapidio/rio-scan.c | 335 +-
+ drivers/rapidio/rio.c | 95 +-
+ drivers/regulator/88pm8607.c | 136 +-
+ drivers/regulator/Kconfig | 2 +-
+ drivers/regulator/ab3100.c | 1 +
+ drivers/regulator/anatop-regulator.c | 31 +-
+ drivers/regulator/max8925-regulator.c | 35 +-
+ drivers/regulator/palmas-regulator.c | 127 +-
+ drivers/regulator/wm831x-dcdc.c | 12 +-
+ drivers/regulator/wm831x-isink.c | 4 +-
+ drivers/regulator/wm831x-ldo.c | 12 +-
+ drivers/remoteproc/remoteproc_virtio.c | 5 +-
+ drivers/rpmsg/Kconfig | 1 -
+ drivers/rtc/Kconfig | 87 +-
+ drivers/rtc/Makefile | 5 +
+ drivers/rtc/class.c | 9 +-
+ drivers/rtc/hctosys.c | 4 +-
+ drivers/rtc/rtc-88pm860x.c | 43 +-
+ drivers/rtc/rtc-at91sam9.c | 13 +-
+ drivers/rtc/rtc-coh901331.c | 3 +-
+ drivers/rtc/rtc-ds1672.c | 26 +-
+ drivers/rtc/rtc-ds2404.c | 303 ++
+ drivers/rtc/rtc-em3027.c | 17 +-
+ drivers/rtc/rtc-isl1208.c | 21 +-
+ drivers/rtc/rtc-jz4740.c | 2 +-
+ drivers/rtc/rtc-m41t80.c | 157 +-
+ drivers/rtc/rtc-max8907.c | 244 ++
+ drivers/rtc/rtc-mxc.c | 30 +-
+ drivers/rtc/rtc-pcf8563.c | 13 +-
+ drivers/rtc/rtc-proc.c | 24 +-
+ drivers/rtc/rtc-rc5t583.c | 331 ++
+ drivers/rtc/rtc-rs5c372.c | 7 +-
+ drivers/rtc/rtc-s35390a.c | 129 +-
+ drivers/rtc/rtc-s3c.c | 4 +-
+ drivers/rtc/rtc-snvs.c | 350 ++
+ drivers/rtc/rtc-spear.c | 12 +-
+ drivers/rtc/rtc-sysfs.c | 6 +
+ drivers/rtc/rtc-tps65910.c | 349 ++
+ drivers/rtc/rtc-x1205.c | 92 +-
+ drivers/s390/kvm/kvm_virtio.c | 5 +-
+ drivers/scsi/aacraid/linit.c | 2 +-
+ drivers/scsi/aic94xx/aic94xx_init.c | 2 +-
+ drivers/scsi/atp870u.c | 11 +-
+ drivers/scsi/ipr.c | 18 +-
+ drivers/spi/spi-omap-100k.c | 2 -
+ drivers/spi/spi-omap2-mcspi.c | 1 -
+ drivers/staging/media/Kconfig | 2 -
+ drivers/staging/media/Makefile | 1 -
+ drivers/staging/media/as102/Makefile | 2 +-
+ drivers/staging/media/cxd2099/Makefile | 6 +-
+ drivers/staging/media/cxd2099/cxd2099.c | 13 +-
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 29 +-
+ drivers/staging/media/easycap/Kconfig | 30 -
+ drivers/staging/media/easycap/Makefile | 10 -
+ drivers/staging/media/easycap/README | 141 -
+ drivers/staging/media/easycap/easycap.h | 567 ---
+ drivers/staging/media/easycap/easycap_ioctl.c | 2443 -----------
+ drivers/staging/media/easycap/easycap_low.c | 968 -----
+ drivers/staging/media/easycap/easycap_main.c | 4239 --------------------
+ drivers/staging/media/easycap/easycap_settings.c | 696 ----
+ drivers/staging/media/easycap/easycap_sound.c | 750 ----
+ drivers/staging/media/easycap/easycap_testcard.c | 155 -
+ drivers/staging/media/go7007/Makefile | 6 +-
+ drivers/staging/media/go7007/go7007-v4l2.c | 4 +-
+ drivers/staging/media/lirc/Kconfig | 6 -
+ drivers/staging/media/lirc/Makefile | 1 -
+ drivers/staging/media/lirc/lirc_ene0100.h | 169 -
+ drivers/staging/media/lirc/lirc_igorplugusb.c | 4 +-
+ drivers/staging/media/lirc/lirc_ttusbir.c | 376 --
+ drivers/staging/media/lirc/lirc_zilog.c | 3 +-
+ drivers/thermal/thermal_sys.c | 2 +-
+ drivers/tty/hvc/hvc_console.c | 33 +-
+ drivers/tty/hvc/hvc_vio.c | 123 +-
+ drivers/usb/core/usb-acpi.c | 7 +-
+ drivers/video/aty/aty128fb.c | 2 +-
+ drivers/video/backlight/88pm860x_bl.c | 146 +-
+ drivers/video/backlight/Kconfig | 30 +-
+ drivers/video/backlight/Makefile | 4 +-
+ drivers/video/backlight/da9052_bl.c | 4 +-
+ drivers/video/backlight/kb3886_bl.c | 4 +-
+ drivers/video/backlight/lm3630_bl.c | 475 +++
+ drivers/video/backlight/lm3639_bl.c | 437 ++
+ drivers/video/backlight/ltv350qv.c | 6 +-
+ drivers/video/backlight/max8925_bl.c | 79 +-
+ drivers/video/backlight/platform_lcd.c | 10 +
+ drivers/video/backlight/progear_bl.c | 162 -
+ drivers/video/backlight/tps65217_bl.c | 342 ++
+ drivers/video/geode/gx1fb_core.c | 2 +-
+ drivers/video/gxt4500.c | 4 +-
+ drivers/video/i810/i810_main.c | 2 +-
+ drivers/video/jz4740_fb.c | 2 +-
+ drivers/video/ps3fb.c | 3 +-
+ drivers/virtio/Kconfig | 17 +-
+ drivers/virtio/Makefile | 3 +-
+ drivers/virtio/virtio.c | 2 +-
+ drivers/virtio/virtio_mmio.c | 29 +-
+ drivers/virtio/virtio_pci.c | 68 +-
+ drivers/virtio/virtio_ring.c | 14 +-
+ drivers/watchdog/iTCO_wdt.c | 1 +
+ drivers/watchdog/m54xx_wdt.c | 21 +-
+ drivers/xen/Makefile | 14 +-
+ drivers/xen/events.c | 14 +-
+ fs/Kconfig.binfmt | 8 +
+ fs/Makefile | 3 +-
+ fs/binfmt_aout.c | 54 +-
+ fs/binfmt_elf.c | 149 +-
+ fs/binfmt_elf_fdpic.c | 6 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/buffer.c | 13 +-
+ fs/ceph/addr.c | 19 +-
+ fs/ceph/caps.c | 2 +-
+ fs/ceph/file.c | 4 +-
+ fs/ceph/ioctl.c | 8 +-
+ fs/ceph/mds_client.c | 3 +-
+ fs/ceph/super.c | 37 +-
+ fs/compat_binfmt_elf.c | 7 +
+ fs/coredump.c | 20 +-
+ fs/coredump.h | 6 +
+ fs/eventpoll.c | 38 +-
+ fs/exec.c | 3 +-
+ fs/ext4/ext4.h | 49 +-
+ fs/ext4/extents.c | 258 +-
+ fs/ext4/file.c | 6 +-
+ fs/ext4/fsync.c | 92 +-
+ fs/ext4/ialloc.c | 9 +
+ fs/ext4/indirect.c | 18 +-
+ fs/ext4/inode.c | 83 +-
+ fs/ext4/ioctl.c | 22 -
+ fs/ext4/mballoc.c | 129 +-
+ fs/ext4/mballoc.h | 5 -
+ fs/ext4/move_extent.c | 520 ++-
+ fs/ext4/namei.c | 105 +-
+ fs/ext4/page-io.c | 176 +-
+ fs/ext4/resize.c | 432 +-
+ fs/ext4/super.c | 92 +-
+ fs/fat/Makefile | 2 +-
+ fs/fat/cache.c | 10 +-
+ fs/fat/dir.c | 56 +-
+ fs/fat/fat.h | 97 +-
+ fs/fat/fatent.c | 13 +-
+ fs/fat/inode.c | 187 +-
+ fs/fat/namei_msdos.c | 7 +-
+ fs/fat/namei_vfat.c | 5 +-
+ fs/fat/nfs.c | 101 +
+ fs/fs-writeback.c | 1 +
+ fs/hpfs/anode.c | 6 +-
+ fs/hpfs/dnode.c | 28 +-
+ fs/jbd2/commit.c | 40 +-
+ fs/jbd2/journal.c | 5 +
+ fs/jbd2/recovery.c | 7 +-
+ fs/jbd2/transaction.c | 65 +-
+ fs/nilfs2/file.c | 1 +
+ fs/omfs/file.c | 5 +-
+ fs/proc/generic.c | 15 +-
+ fs/proc/inode.c | 1 -
+ fs/proc/internal.h | 2 +-
+ fs/proc/proc_sysctl.c | 3 +-
+ fs/proc/root.c | 2 +-
+ fs/pstore/Kconfig | 1 +
+ fs/pstore/ftrace.c | 96 +-
+ fs/pstore/internal.h | 6 +
+ fs/pstore/platform.c | 9 +-
+ fs/pstore/ram.c | 28 +-
+ fs/super.c | 2 +-
+ include/acpi/acbuffer.h | 235 ++
+ include/acpi/acnames.h | 3 +-
+ include/acpi/acpi_bus.h | 60 +-
+ include/acpi/acpixf.h | 7 +-
+ include/acpi/actbl.h | 60 +-
+ include/acpi/actbl1.h | 16 +-
+ include/acpi/actbl2.h | 123 +-
+ include/acpi/actbl3.h | 13 +-
+ include/acpi/actypes.h | 7 -
+ include/asm-generic/bitops/le.h | 10 +
+ include/asm-generic/unistd.h | 4 -
+ include/linux/Kbuild | 10 +-
+ include/linux/audit.h | 206 +-
+ include/linux/binfmts.h | 3 +-
+ include/linux/ceph/mon_client.h | 1 -
+ include/linux/ceph/osd_client.h | 2 +-
+ include/linux/ceph/osdmap.h | 6 +-
+ include/linux/compat.h | 5 -
+ include/linux/coredump.h | 5 +
+ include/linux/dvb/frontend.h | 61 +-
+ include/linux/dvb/version.h | 2 +-
+ include/linux/elf.h | 6 +
+ include/linux/eventpoll.h | 1 +
+ include/linux/falloc.h | 1 +
+ include/linux/genalloc.h | 27 +
+ include/linux/i2c-mux-gpio.h | 5 +
+ include/linux/i2c-mux.h | 1 +
+ include/linux/i2c.h | 2 +-
+ include/linux/i2c/pca954x.h | 1 +
+ include/linux/i2c/twl.h | 1 +
+ include/linux/idr.h | 10 +-
+ include/linux/init.h | 27 +-
+ include/linux/ioport.h | 3 +-
+ include/linux/libfdt.h | 4 +-
+ include/linux/mfd/88pm860x.h | 132 +-
+ include/linux/mfd/ab3100.h | 129 +
+ include/linux/mfd/abx500.h | 117 +-
+ include/linux/mfd/abx500/ab8500.h | 2 -
+ include/linux/mfd/anatop.h | 40 -
+ include/linux/mfd/da9055/core.h | 94 +
+ include/linux/mfd/da9055/pdata.h | 32 +
+ include/linux/mfd/da9055/reg.h | 699 ++++
+ include/linux/mfd/lp8788-isink.h | 52 +
+ include/linux/mfd/lp8788.h | 364 ++
+ include/linux/mfd/lpc_ich.h | 1 +
+ include/linux/mfd/max8907.h | 252 ++
+ include/linux/mfd/max8925.h | 26 +-
+ include/linux/mfd/palmas.h | 232 +-
+ include/linux/mfd/rc5t583.h | 22 +
+ include/linux/mfd/smsc.h | 109 +
+ include/linux/mfd/syscon.h | 23 +
+ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 319 ++
+ include/linux/mfd/tc3589x.h | 1 +
+ include/linux/mfd/tps65217.h | 18 +
+ include/linux/mfd/tps6586x.h | 1 +
+ include/linux/mfd/tps65910.h | 13 +
+ include/linux/mfd/twl6040.h | 11 +-
+ include/linux/nbd.h | 15 +-
+ include/linux/of.h | 6 +
+ include/linux/omap3isp.h | 6 +-
+ include/linux/pci_ids.h | 1 +
+ include/linux/percpu.h | 2 +-
+ include/linux/platform_data/lm3630_bl.h | 57 +
+ include/linux/platform_data/lm3639_bl.h | 69 +
+ include/linux/platform_data/lp855x.h | 2 +
+ include/linux/platform_data/lp8727.h | 51 +-
+ include/linux/power/charger-manager.h | 47 +-
+ include/linux/power_supply.h | 5 +
+ include/linux/pstore.h | 8 -
+ include/linux/rio.h | 21 +-
+ include/linux/rio_drv.h | 5 +
+ include/linux/rtc-ds2404.h | 20 +
+ include/linux/rtc.h | 2 +-
+ include/linux/sched.h | 1 -
+ include/linux/slab.h | 6 +-
+ include/linux/slab_def.h | 27 +-
+ include/linux/slob_def.h | 6 +-
+ include/linux/v4l2-common.h | 8 +-
+ include/linux/v4l2-controls.h | 761 ++++
+ include/linux/v4l2-subdev.h | 10 +
+ include/linux/videodev2.h | 726 +---
+ include/linux/virtio.h | 2 +
+ include/linux/virtio_config.h | 23 +
+ include/linux/virtio_ring.h | 3 +-
+ include/media/ad9389b.h | 49 +
+ include/media/adv7604.h | 153 +
+ include/media/ir-rx51.h | 10 +
+ include/media/mt9v032.h | 3 +
+ include/media/omap3isp.h | 14 +-
+ include/media/s5k4ecgx.h | 37 +
+ include/media/s5p_fimc.h | 18 +
+ include/media/saa7146.h | 4 -
+ include/media/soc_camera.h | 16 +-
+ include/media/v4l2-chip-ident.h | 6 +
+ include/media/v4l2-common.h | 17 +-
+ include/media/v4l2-ctrls.h | 43 +-
+ include/media/v4l2-dev.h | 12 +-
+ include/media/v4l2-event.h | 4 +-
+ include/media/v4l2-ioctl.h | 26 +-
+ include/media/v4l2-mem2mem.h | 4 +-
+ include/media/v4l2-subdev.h | 8 +-
+ include/media/videobuf-dvb.h | 4 +-
+ include/media/videobuf2-core.h | 2 +-
+ include/net/ip_fib.h | 1 +
+ include/net/net_namespace.h | 2 +
+ include/net/sctp/structs.h | 2 +-
+ include/sound/tea575x-tuner.h | 4 +
+ include/trace/events/ext4.h | 242 +-
+ include/xen/events.h | 2 +
+ include/xen/interface/features.h | 3 +
+ include/xen/interface/io/protocols.h | 3 +
+ include/xen/interface/memory.h | 12 +-
+ include/xen/interface/physdev.h | 2 +-
+ include/xen/interface/version.h | 2 +-
+ include/xen/xen.h | 4 +-
+ init/Kconfig | 7 +
+ kernel/kexec.c | 1 -
+ kernel/resource.c | 50 +-
+ kernel/signal.c | 3 +-
+ kernel/sys.c | 3 +-
+ kernel/sysctl.c | 12 +-
+ kernel/taskstats.c | 1 +
+ kernel/trace/trace.c | 8 +-
+ kernel/trace/trace_functions.c | 15 +-
+ lib/Kconfig.debug | 9 +-
+ lib/crc32.c | 9 +-
+ lib/decompress.c | 9 +-
+ lib/dma-debug.c | 5 -
+ lib/gcd.c | 3 +
+ lib/gen_crc32table.c | 6 +-
+ lib/genalloc.c | 88 +-
+ lib/idr.c | 32 +-
+ lib/parser.c | 10 +-
+ lib/plist.c | 4 +-
+ lib/scatterlist.c | 16 +-
+ lib/spinlock_debug.c | 32 +-
+ lib/vsprintf.c | 139 +-
+ mm/percpu.c | 2 +-
+ mm/slab.c | 348 +-
+ mm/slab.h | 19 +-
+ mm/slab_common.c | 159 +-
+ mm/slob.c | 91 +-
+ mm/slub.c | 208 +-
+ mm/util.c | 35 +-
+ net/8021q/vlan_core.c | 3 +-
+ net/can/af_can.c | 2 +-
+ net/can/bcm.c | 2 +-
+ net/can/gw.c | 2 +-
+ net/can/raw.c | 2 +-
+ net/ceph/mon_client.c | 7 +-
+ net/ceph/osd_client.c | 47 +-
+ net/ceph/osdmap.c | 18 +-
+ net/ceph/pagelist.c | 5 +-
+ net/decnet/dn_rules.c | 2 +-
+ net/ipv4/fib_rules.c | 2 +-
+ net/ipv4/fib_semantics.c | 2 +
+ net/ipv4/ipmr.c | 2 +-
+ net/ipv6/addrconf.c | 15 +-
+ net/ipv6/addrlabel.c | 2 +-
+ net/ipv6/fib6_rules.c | 2 +-
+ net/ipv6/ip6mr.c | 2 +-
+ net/ipv6/route.c | 11 +-
+ net/irda/af_irda.c | 2 +-
+ net/irda/irttp.c | 2 +-
+ net/nfc/llcp/sock.c | 8 +-
+ net/sctp/input.c | 2 +-
+ net/sctp/outqueue.c | 15 +-
+ net/sctp/sm_sideeffect.c | 4 +-
+ net/sctp/sm_statefuns.c | 2 +-
+ net/tipc/socket.c | 1 +
+ scripts/Kbuild.include | 2 +-
+ scripts/checkpatch.pl | 37 +-
+ scripts/kernel-doc | 23 +-
+ security/device_cgroup.c | 373 +-
+ security/integrity/ima/ima.h | 6 +-
+ security/integrity/ima/ima_appraise.c | 2 +-
+ sound/i2c/other/tea575x-tuner.c | 205 +-
+ sound/pci/Kconfig | 4 +-
+ sound/soc/codecs/wm5100.c | 2 +-
+ tools/lguest/lguest.c | 1 +
+ tools/power/acpi/Makefile | 18 +
+ tools/power/acpi/acpidump.8 | 59 +
+ tools/power/acpi/acpidump.c | 560 +++
+ tools/power/x86/turbostat/turbostat.8 | 55 +-
+ tools/power/x86/turbostat/turbostat.c | 214 +-
+ tools/testing/selftests/Makefile | 2 +-
+ tools/testing/selftests/epoll/Makefile | 11 +
+ tools/testing/selftests/epoll/test_epoll.c | 344 ++
+ tools/virtio/virtio-trace/Makefile | 13 +
+ tools/virtio/virtio-trace/README | 118 +
+ tools/virtio/virtio-trace/trace-agent-ctl.c | 137 +
+ tools/virtio/virtio-trace/trace-agent-rw.c | 192 +
+ tools/virtio/virtio-trace/trace-agent.c | 270 ++
+ tools/virtio/virtio-trace/trace-agent.h | 75 +
+ virt/kvm/kvm_main.c | 3 +-
+ 2876 files changed, 84756 insertions(+), 42110 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-firmware_node
+ create mode 100644 Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml
+ create mode 100644 Documentation/DocBook/media/v4l/vidioc-subdev-g-edid.xml
+ delete mode 100644 Documentation/aoe/mkdevs.sh
+ delete mode 100644 Documentation/aoe/mkshelf.sh
+ create mode 100644 Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/xen.txt
+ create mode 100644 Documentation/devicetree/bindings/crypto/mv_cesa.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-fan.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/88pm860x.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/syscon.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/twl4030-audio.txt
+ create mode 100644 Documentation/devicetree/bindings/misc/ifm-csi.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/88pm860x.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/max8907.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/snvs-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/video/backlight/88pm860x.txt
+ create mode 100644 Documentation/smsc_ece1099.txt
+ create mode 100644 arch/arm/boot/dts/armada-xp-mv78230.dtsi
+ create mode 100644 arch/arm/boot/dts/armada-xp-mv78260.dtsi
+ create mode 100644 arch/arm/boot/dts/armada-xp-mv78460.dtsi
+ create mode 100644 arch/arm/boot/dts/dove-cm-a510.dts
+ create mode 100644 arch/arm/boot/dts/dove-cubox.dts
+ create mode 100644 arch/arm/boot/dts/dove-dove-db.dts
+ create mode 100644 arch/arm/boot/dts/dove.dtsi
+ create mode 100644 arch/arm/boot/dts/integrator.dtsi
+ create mode 100644 arch/arm/boot/dts/integratorap.dts
+ create mode 100644 arch/arm/boot/dts/integratorcp.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-dockstar.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+ create mode 100644 arch/arm/boot/dts/xenvm-4.2.dts
+ delete mode 100644 arch/arm/include/asm/current.h
+ delete mode 100644 arch/arm/include/asm/exec.h
+ delete mode 100644 arch/arm/include/asm/hardware/linkup-l1110.h
+ create mode 100644 arch/arm/include/asm/hypervisor.h
+ delete mode 100644 arch/arm/include/asm/ipcbuf.h
+ delete mode 100644 arch/arm/include/asm/msgbuf.h
+ create mode 100644 arch/arm/include/asm/opcodes-virt.h
+ delete mode 100644 arch/arm/include/asm/param.h
+ delete mode 100644 arch/arm/include/asm/parport.h
+ delete mode 100644 arch/arm/include/asm/segment.h
+ delete mode 100644 arch/arm/include/asm/sembuf.h
+ delete mode 100644 arch/arm/include/asm/serial.h
+ delete mode 100644 arch/arm/include/asm/shmbuf.h
+ delete mode 100644 arch/arm/include/asm/socket.h
+ delete mode 100644 arch/arm/include/asm/sockios.h
+ create mode 100644 arch/arm/include/asm/sync_bitops.h
+ delete mode 100644 arch/arm/include/asm/termbits.h
+ delete mode 100644 arch/arm/include/asm/termios.h
+ delete mode 100644 arch/arm/include/asm/types.h
+ delete mode 100644 arch/arm/include/asm/unaligned.h
+ create mode 100644 arch/arm/include/asm/xen/events.h
+ create mode 100644 arch/arm/include/asm/xen/hypercall.h
+ create mode 100644 arch/arm/include/asm/xen/hypervisor.h
+ create mode 100644 arch/arm/include/asm/xen/interface.h
+ create mode 100644 arch/arm/include/asm/xen/page.h
+ rename arch/arm/kernel/{compat.c => atags_compat.c} (99%)
+ create mode 100644 arch/arm/kernel/atags_parse.c
+ rename arch/arm/kernel/{atags.c => atags_proc.c} (100%)
+ delete mode 100644 arch/arm/kernel/compat.h
+ create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c
+ create mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c
+ create mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c
+ create mode 100644 arch/arm/mach-mvebu/addr-map.c
+ create mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h
+ create mode 100644 arch/arm/mach-omap2/pmu.c
+ delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1111.h
+ delete mode 100644 arch/arm/mach-sa1100/include/mach/lart.h
+ delete mode 100644 arch/arm/mach-tegra/include/mach/smmu.h
+ create mode 100644 arch/arm/plat-mxc/devices/platform-imx27-coda.c
+ create mode 100644 arch/arm/xen/Makefile
+ create mode 100644 arch/arm/xen/enlighten.c
+ create mode 100644 arch/arm/xen/grant-table.c
+ create mode 100644 arch/arm/xen/hypercall.S
+ delete mode 100644 arch/c6x/include/asm/signal.h
+ delete mode 100644 arch/microblaze/include/asm/clinkage.h
+ create mode 100644 arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi
+ create mode 100644 arch/powerpc/boot/dts/o2d.dts
+ create mode 100644 arch/powerpc/boot/dts/o2d.dtsi
+ create mode 100644 arch/powerpc/boot/dts/o2d300.dts
+ create mode 100644 arch/powerpc/boot/dts/o2dnt2.dts
+ create mode 100644 arch/powerpc/boot/dts/o2i.dts
+ create mode 100644 arch/powerpc/boot/dts/o2mnt.dts
+ create mode 100644 arch/powerpc/boot/dts/o3dnt.dts
+ delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
+ delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
+ create mode 100644 arch/powerpc/boot/dts/p1022rdk.dts
+ delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
+ delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
+ create mode 100644 arch/powerpc/boot/dts/p5040ds.dts
+ delete mode 100644 arch/powerpc/include/asm/abs_addr.h
+ create mode 100644 arch/powerpc/include/asm/probes.h
+ create mode 100644 arch/powerpc/include/asm/uprobes.h
+ create mode 100644 arch/powerpc/kernel/uprobes.c
+ create mode 100644 arch/powerpc/platforms/85xx/p1022_rdk.c
+ create mode 100644 arch/powerpc/platforms/85xx/p5040_ds.c
+ create mode 100644 arch/powerpc/platforms/pseries/eeh_pe.c
+ create mode 100644 arch/powerpc/sysdev/fsl_mpic_err.c
+ create mode 100644 drivers/acpi/acpica/utxfinit.c
+ create mode 100644 drivers/gpio/gpio-mvebu.c
+ create mode 100644 drivers/gpio/gpio-twl6040.c
+ create mode 100644 drivers/media/common/b2c2/Kconfig
+ create mode 100644 drivers/media/common/b2c2/Makefile
+ rename drivers/media/{dvb => common}/b2c2/flexcop-common.h (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-eeprom.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-fe-tuner.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-hw-filter.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-i2c.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-misc.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-reg.h (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-sram.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop.c (99%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop.h (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_be.h (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_le.h (100%)
+ create mode 100644 drivers/media/common/saa7146/Kconfig
+ create mode 100644 drivers/media/common/saa7146/Makefile
+ rename drivers/media/common/{ => saa7146}/saa7146_core.c (98%)
+ rename drivers/media/common/{ => saa7146}/saa7146_fops.c (94%)
+ rename drivers/media/common/{ => saa7146}/saa7146_hlp.c (100%)
+ rename drivers/media/common/{ => saa7146}/saa7146_i2c.c (100%)
+ rename drivers/media/common/{ => saa7146}/saa7146_vbi.c (100%)
+ rename drivers/media/common/{ => saa7146}/saa7146_video.c (99%)
+ create mode 100644 drivers/media/common/siano/Kconfig
+ rename drivers/media/{dvb => common}/siano/Makefile (57%)
+ rename drivers/media/{dvb => common}/siano/sms-cards.c (100%)
+ rename drivers/media/{dvb => common}/siano/sms-cards.h (100%)
+ rename drivers/media/{dvb => common}/siano/smscoreapi.c (100%)
+ rename drivers/media/{dvb => common}/siano/smscoreapi.h (100%)
+ rename drivers/media/{dvb => common}/siano/smsdvb.c (100%)
+ rename drivers/media/{dvb => common}/siano/smsendian.c (100%)
+ rename drivers/media/{dvb => common}/siano/smsendian.h (100%)
+ rename drivers/media/{dvb => common}/siano/smsir.c (100%)
+ rename drivers/media/{dvb => common}/siano/smsir.h (100%)
+ create mode 100644 drivers/media/dvb-core/Kconfig
+ rename drivers/media/{dvb => }/dvb-core/Makefile (100%)
+ rename drivers/media/{dvb => }/dvb-core/demux.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dmxdev.c (99%)
+ rename drivers/media/{dvb => }/dvb-core/dmxdev.h (100%)
+ rename drivers/media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h (99%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_demux.c (98%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_demux.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_filter.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_filter.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_frontend.c (89%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_frontend.h (98%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_math.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_math.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_net.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_net.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvbdev.c (99%)
+ rename drivers/media/{dvb => }/dvb-core/dvbdev.h (80%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/Kconfig (83%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/Makefile (92%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.c (86%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.h (97%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9013_priv.h (98%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.c (87%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.h (94%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9033_priv.h (92%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_common.c (93%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_decoder.c (98%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_dig.c (95%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_priv.h (93%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1-d01a.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bsru6.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r.h (92%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_c.c (89%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_core.c (70%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_priv.h (89%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t.c (91%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t2.c (91%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_hard.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_map_firm.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxk.h (95%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_map.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.c (96%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.h (97%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.c (87%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.h (95%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/eds1547.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.c (89%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.h (96%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2_priv.h (96%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe-priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbh24.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt312_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt352_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.c (93%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.c (88%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.h (90%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830_priv.h (75%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.c (77%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.h (84%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832_priv.h (55%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s921.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s921.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_algo.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_cfg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_reg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_cfg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_proc.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_regs.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_core.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_init.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_reg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_sw.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_reg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_reg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10021.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10023.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda1002x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071_priv.h (98%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd_maps.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.c (86%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261_cfg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tdhd1.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/z0194a.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353_priv.h (100%)
+ delete mode 100644 drivers/media/dvb/Kconfig
+ delete mode 100644 drivers/media/dvb/Makefile
+ delete mode 100644 drivers/media/dvb/b2c2/Kconfig
+ delete mode 100644 drivers/media/dvb/b2c2/Makefile
+ delete mode 100644 drivers/media/dvb/bt8xx/Kconfig
+ delete mode 100644 drivers/media/dvb/bt8xx/Makefile
+ delete mode 100644 drivers/media/dvb/dm1105/Makefile
+ delete mode 100644 drivers/media/dvb/dvb-usb/Kconfig
+ delete mode 100644 drivers/media/dvb/dvb-usb/Makefile
+ delete mode 100644 drivers/media/dvb/dvb-usb/af9015.c
+ delete mode 100644 drivers/media/dvb/dvb-usb/it913x.c
+ delete mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.c
+ delete mode 100644 drivers/media/dvb/frontends/ec100_priv.h
+ delete mode 100644 drivers/media/dvb/ngene/Kconfig
+ delete mode 100644 drivers/media/dvb/pluto2/Makefile
+ delete mode 100644 drivers/media/dvb/siano/Kconfig
+ delete mode 100644 drivers/media/dvb/ttusb-budget/Makefile
+ rename drivers/media/{dvb => }/firewire/Kconfig (100%)
+ rename drivers/media/{dvb => }/firewire/Makefile (51%)
+ rename drivers/media/{dvb => }/firewire/firedtv-avc.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-ci.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-dvb.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-fe.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-fw.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-rc.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv.h (100%)
+ create mode 100644 drivers/media/i2c/Kconfig
+ create mode 100644 drivers/media/i2c/Makefile
+ create mode 100644 drivers/media/i2c/ad9389b.c
+ rename drivers/media/{video => i2c}/adp1653.c (99%)
+ rename drivers/media/{video => i2c}/adv7170.c (100%)
+ rename drivers/media/{video => i2c}/adv7175.c (100%)
+ rename drivers/media/{video => i2c}/adv7180.c (100%)
+ rename drivers/media/{video => i2c}/adv7183.c (100%)
+ rename drivers/media/{video => i2c}/adv7183_regs.h (100%)
+ rename drivers/media/{video => i2c}/adv7343.c (100%)
+ rename drivers/media/{video => i2c}/adv7343_regs.h (100%)
+ rename drivers/media/{video => i2c}/adv7393.c (100%)
+ rename drivers/media/{video => i2c}/adv7393_regs.h (100%)
+ create mode 100644 drivers/media/i2c/adv7604.c
+ rename drivers/media/{video => i2c}/ak881x.c (100%)
+ rename drivers/media/{video => i2c}/aptina-pll.c (100%)
+ rename drivers/media/{video => i2c}/aptina-pll.h (100%)
+ rename drivers/media/{video => i2c}/as3645a.c (99%)
+ rename drivers/media/{video => i2c}/bt819.c (100%)
+ rename drivers/media/{video => i2c}/bt856.c (100%)
+ rename drivers/media/{video => i2c}/bt866.c (100%)
+ rename drivers/media/{video => i2c}/btcx-risc.c (100%)
+ rename drivers/media/{video => i2c}/btcx-risc.h (100%)
+ rename drivers/media/{video => i2c}/cs5345.c (100%)
+ rename drivers/media/{video => i2c}/cs53l32a.c (100%)
+ rename drivers/media/{video => i2c}/cx2341x.c (100%)
+ rename drivers/media/{video => i2c}/cx25840/Kconfig (100%)
+ rename drivers/media/{video => i2c}/cx25840/Makefile (80%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-audio.c (100%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-core.c (100%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-core.h (100%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-firmware.c (92%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-ir.c (100%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-vbi.c (98%)
+ rename drivers/media/{video => i2c}/ir-kbd-i2c.c (100%)
+ rename drivers/media/{video => i2c}/ks0127.c (99%)
+ rename drivers/media/{video => i2c}/ks0127.h (100%)
+ rename drivers/media/{video => i2c}/m52790.c (100%)
+ rename drivers/media/{video => i2c}/m5mols/Kconfig (100%)
+ rename drivers/media/{video => i2c}/m5mols/Makefile (100%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols.h (98%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols_capture.c (100%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols_controls.c (99%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols_core.c (95%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols_reg.h (100%)
+ rename drivers/media/{video => i2c}/msp3400-driver.c (98%)
+ rename drivers/media/{video => i2c}/msp3400-driver.h (100%)
+ rename drivers/media/{video => i2c}/msp3400-kthreads.c (100%)
+ rename drivers/media/{video => i2c}/mt9m032.c (99%)
+ rename drivers/media/{video => i2c}/mt9p031.c (98%)
+ rename drivers/media/{video => i2c}/mt9t001.c (100%)
+ rename drivers/media/{video => i2c}/mt9v011.c (100%)
+ rename drivers/media/{video => i2c}/mt9v032.c (88%)
+ rename drivers/media/{video => i2c}/noon010pc30.c (100%)
+ rename drivers/media/{video => i2c}/ov7670.c (100%)
+ create mode 100644 drivers/media/i2c/s5k4ecgx.c
+ rename drivers/media/{video => i2c}/s5k6aa.c (99%)
+ rename drivers/media/{video => i2c}/saa6588.c (100%)
+ rename drivers/media/{video => i2c}/saa7110.c (100%)
+ rename drivers/media/{video => i2c}/saa7115.c (99%)
+ rename drivers/media/{video => i2c}/saa711x_regs.h (100%)
+ rename drivers/media/{video => i2c}/saa7127.c (99%)
+ rename drivers/media/{video => i2c}/saa717x.c (100%)
+ rename drivers/media/{video => i2c}/saa7185.c (100%)
+ rename drivers/media/{video => i2c}/saa7191.c (100%)
+ rename drivers/media/{video => i2c}/saa7191.h (100%)
+ rename drivers/media/{video => i2c}/smiapp-pll.c (99%)
+ rename drivers/media/{video => i2c}/smiapp-pll.h (98%)
+ rename drivers/media/{video => i2c}/smiapp/Kconfig (100%)
+ rename drivers/media/{video => i2c}/smiapp/Makefile (78%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-core.c (98%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-limits.c (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-limits.h (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.c (94%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.h (98%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-reg-defs.h (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-reg.h (98%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-regs.c (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-regs.h (100%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp.h (99%)
+ create mode 100644 drivers/media/i2c/soc_camera/Kconfig
+ create mode 100644 drivers/media/i2c/soc_camera/Makefile
+ rename drivers/media/{video => i2c/soc_camera}/imx074.c (95%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9m001.c (97%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9m111.c (95%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9t031.c (97%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9t112.c (98%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9v022.c (93%)
+ rename drivers/media/{video => i2c/soc_camera}/ov2640.c (98%)
+ rename drivers/media/{video => i2c/soc_camera}/ov5642.c (96%)
+ rename drivers/media/{video => i2c/soc_camera}/ov6650.c (95%)
+ rename drivers/media/{video => i2c/soc_camera}/ov772x.c (81%)
+ rename drivers/media/{video => i2c/soc_camera}/ov9640.c (97%)
+ rename drivers/media/{video => i2c/soc_camera}/ov9640.h (100%)
+ rename drivers/media/{video => i2c/soc_camera}/ov9740.c (97%)
+ rename drivers/media/{video => i2c/soc_camera}/rj54n1cb0c.c (98%)
+ rename drivers/media/{video => i2c/soc_camera}/tw9910.c (98%)
+ rename drivers/media/{video => i2c}/sr030pc30.c (100%)
+ rename drivers/media/{video => i2c}/tcm825x.c (99%)
+ rename drivers/media/{video => i2c}/tcm825x.h (99%)
+ rename drivers/media/{video => i2c}/tda7432.c (100%)
+ rename drivers/media/{video => i2c}/tda9840.c (100%)
+ rename drivers/media/{video => i2c}/tea6415c.c (99%)
+ rename drivers/media/{video => i2c}/tea6415c.h (100%)
+ rename drivers/media/{video => i2c}/tea6420.c (100%)
+ rename drivers/media/{video => i2c}/tea6420.h (100%)
+ rename drivers/media/{video => i2c}/ths7303.c (100%)
+ rename drivers/media/{video => i2c}/tlv320aic23b.c (100%)
+ rename drivers/media/{video => i2c}/tvaudio.c (99%)
+ rename drivers/media/{video => i2c}/tveeprom.c (100%)
+ rename drivers/media/{video => i2c}/tvp514x.c (99%)
+ rename drivers/media/{video => i2c}/tvp514x_regs.h (99%)
+ rename drivers/media/{video => i2c}/tvp5150.c (99%)
+ rename drivers/media/{video => i2c}/tvp5150_reg.h (100%)
+ rename drivers/media/{video => i2c}/tvp7002.c (100%)
+ rename drivers/media/{video => i2c}/tvp7002_reg.h (100%)
+ rename drivers/media/{video => i2c}/upd64031a.c (100%)
+ rename drivers/media/{video => i2c}/upd64083.c (100%)
+ rename drivers/media/{video => i2c}/vp27smpx.c (100%)
+ rename drivers/media/{video => i2c}/vpx3220.c (100%)
+ rename drivers/media/{video => i2c}/vs6624.c (100%)
+ rename drivers/media/{video => i2c}/vs6624_regs.h (100%)
+ rename drivers/media/{video => i2c}/wm8739.c (100%)
+ rename drivers/media/{video => i2c}/wm8775.c (100%)
+ create mode 100644 drivers/media/mmc/Kconfig
+ create mode 100644 drivers/media/mmc/Makefile
+ create mode 100644 drivers/media/mmc/siano/Kconfig
+ create mode 100644 drivers/media/mmc/siano/Makefile
+ rename drivers/media/{dvb => mmc}/siano/smssdio.c (100%)
+ create mode 100644 drivers/media/parport/Kconfig
+ create mode 100644 drivers/media/parport/Makefile
+ rename drivers/media/{video => parport}/bw-qcam.c (100%)
+ rename drivers/media/{video => parport}/c-qcam.c (100%)
+ rename drivers/media/{video => parport}/pms.c (100%)
+ rename drivers/media/{video => parport}/w9966.c (100%)
+ create mode 100644 drivers/media/pci/Kconfig
+ create mode 100644 drivers/media/pci/Makefile
+ create mode 100644 drivers/media/pci/b2c2/Kconfig
+ create mode 100644 drivers/media/pci/b2c2/Makefile
+ rename drivers/media/{dvb => pci}/b2c2/flexcop-dma.c (100%)
+ rename drivers/media/{dvb => pci}/b2c2/flexcop-pci.c (100%)
+ create mode 100644 drivers/media/pci/bt8xx/Kconfig
+ create mode 100644 drivers/media/pci/bt8xx/Makefile
+ rename drivers/media/{video => pci}/bt8xx/bt848.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/bt878.c (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/bt878.h (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.h (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-cards.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-driver.c (99%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-gpio.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-i2c.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-if.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-input.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-risc.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-vbi.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv.h (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttvp.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst.c (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst_ca.c (99%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst_ca.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst_common.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst_priv.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h (100%)
+ rename drivers/media/{video => pci}/cx18/Kconfig (68%)
+ rename drivers/media/{video => pci}/cx18/Makefile (78%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-main.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-audio.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-audio.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-audio.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-core.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-core.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-firmware.c (99%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-vbi.c (99%)
+ rename drivers/media/{video => pci}/cx18/cx18-cards.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-cards.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-controls.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-controls.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-driver.c (99%)
+ rename drivers/media/{video => pci}/cx18/cx18-driver.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-dvb.c (99%)
+ rename drivers/media/{video => pci}/cx18/cx18-dvb.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-fileops.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-fileops.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-firmware.c (98%)
+ rename drivers/media/{video => pci}/cx18/cx18-firmware.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-gpio.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-gpio.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-i2c.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-io.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-io.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-ioctl.c (99%)
+ rename drivers/media/{video => pci}/cx18/cx18-ioctl.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-irq.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-irq.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-mailbox.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-mailbox.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-queue.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-queue.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-scb.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-scb.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-streams.c (98%)
+ rename drivers/media/{video => pci}/cx18/cx18-streams.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-vbi.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-vbi.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-version.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-video.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-video.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx23418.h (100%)
+ create mode 100644 drivers/media/pci/cx23885/Kconfig
+ rename drivers/media/{video => pci}/cx23885/Makefile (72%)
+ rename drivers/media/{video => pci}/cx23885/altera-ci.c (99%)
+ rename drivers/media/{video => pci}/cx23885/altera-ci.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cimax2.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cimax2.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-417.c (99%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-alsa.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-av.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-av.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-cards.c (98%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-core.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-dvb.c (95%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-f300.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-f300.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-input.c (96%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-input.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-ir.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-ir.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-reg.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-vbi.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-video.c (99%)
+ rename drivers/media/{video => pci}/cx23885/cx23885.h (99%)
+ rename drivers/media/{video => pci}/cx23885/cx23888-ir.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23888-ir.h (100%)
+ rename drivers/media/{video => pci}/cx23885/netup-eeprom.c (100%)
+ rename drivers/media/{video => pci}/cx23885/netup-eeprom.h (100%)
+ rename drivers/media/{video => pci}/cx23885/netup-init.c (100%)
+ rename drivers/media/{video => pci}/cx23885/netup-init.h (100%)
+ rename drivers/media/{video => pci}/cx25821/Kconfig (100%)
+ rename drivers/media/{video => pci}/cx25821/Makefile (67%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-alsa.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-audio.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-biffuncs.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-cards.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-core.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-gpio.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-medusa-defines.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-medusa-reg.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-reg.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-sram.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video.c (99%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video.h (99%)
+ rename drivers/media/{video => pci}/cx25821/cx25821.h (100%)
+ rename drivers/media/{video => pci}/cx88/Kconfig (70%)
+ rename drivers/media/{video => pci}/cx88/Makefile (73%)
+ rename drivers/media/{video => pci}/cx88/cx88-alsa.c (99%)
+ rename drivers/media/{video => pci}/cx88/cx88-blackbird.c (99%)
+ rename drivers/media/{video => pci}/cx88/cx88-cards.c (99%)
+ rename drivers/media/{video => pci}/cx88/cx88-core.c (99%)
+ rename drivers/media/{video => pci}/cx88/cx88-dsp.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-dvb.c (99%)
+ rename drivers/media/{video => pci}/cx88/cx88-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-input.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-mpeg.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-reg.h (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-tvaudio.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-vbi.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-video.c (99%)
+ rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.h (100%)
+ rename drivers/media/{video => pci}/cx88/cx88.h (99%)
+ rename drivers/media/{dvb => pci}/ddbridge/Kconfig (60%)
+ rename drivers/media/{dvb => pci}/ddbridge/Makefile (61%)
+ rename drivers/media/{dvb => pci}/ddbridge/ddbridge-core.c (99%)
+ rename drivers/media/{dvb => pci}/ddbridge/ddbridge-regs.h (100%)
+ rename drivers/media/{dvb => pci}/ddbridge/ddbridge.h (100%)
+ rename drivers/media/{dvb => pci}/dm1105/Kconfig (57%)
+ create mode 100644 drivers/media/pci/dm1105/Makefile
+ rename drivers/media/{dvb => pci}/dm1105/dm1105.c (100%)
+ rename drivers/media/{video => pci}/ivtv/Kconfig (67%)
+ rename drivers/media/{video => pci}/ivtv/Makefile (53%)
+ create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-main.c
+ create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.c
+ create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.h
+ create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-pcm.c
+ create mode 100644 drivers/media/pci/ivtv/ivtv-alsa-pcm.h
+ create mode 100644 drivers/media/pci/ivtv/ivtv-alsa.h
+ rename drivers/media/{video => pci}/ivtv/ivtv-cards.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-cards.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-controls.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-controls.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-driver.c (97%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-driver.h (98%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-fileops.c (96%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-fileops.h (94%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-firmware.c (98%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-firmware.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-gpio.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-gpio.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-i2c.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-i2c.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.c (95%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-irq.c (95%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-irq.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-queue.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-queue.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-routing.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-routing.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-streams.c (95%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-streams.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-udma.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-udma.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-vbi.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-vbi.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-version.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-yuv.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-yuv.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtvfb.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/Kconfig (62%)
+ rename drivers/media/{dvb => pci}/mantis/Makefile (88%)
+ rename drivers/media/{dvb => pci}/mantis/hopper_cards.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_ca.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_ca.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_cards.c (99%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_common.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_core.c (99%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_core.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_dma.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_dma.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_dvb.c (98%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_dvb.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_evm.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_hif.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_hif.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_i2c.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_i2c.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_input.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_ioc.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_ioc.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_link.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_pci.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_pci.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_reg.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_uart.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_uart.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.h (100%)
+ create mode 100644 drivers/media/pci/meye/Kconfig
+ create mode 100644 drivers/media/pci/meye/Makefile
+ rename drivers/media/{video => pci/meye}/meye.c (100%)
+ rename drivers/media/{video => pci/meye}/meye.h (100%)
+ create mode 100644 drivers/media/pci/ngene/Kconfig
+ rename drivers/media/{dvb => pci}/ngene/Makefile (63%)
+ rename drivers/media/{dvb => pci}/ngene/ngene-cards.c (71%)
+ rename drivers/media/{dvb => pci}/ngene/ngene-core.c (98%)
+ rename drivers/media/{dvb => pci}/ngene/ngene-dvb.c (100%)
+ rename drivers/media/{dvb => pci}/ngene/ngene-i2c.c (100%)
+ rename drivers/media/{dvb => pci}/ngene/ngene.h (100%)
+ rename drivers/media/{dvb => pci}/pluto2/Kconfig (100%)
+ create mode 100644 drivers/media/pci/pluto2/Makefile
+ rename drivers/media/{dvb => pci}/pluto2/pluto2.c (100%)
+ rename drivers/media/{dvb => pci}/pt1/Kconfig (100%)
+ rename drivers/media/{dvb => pci}/pt1/Makefile (56%)
+ rename drivers/media/{dvb => pci}/pt1/pt1.c (100%)
+ rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c (98%)
+ rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h (100%)
+ rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c (100%)
+ rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h (100%)
+ rename drivers/media/{video => pci}/saa7134/Kconfig (56%)
+ rename drivers/media/{video => pci}/saa7134/Makefile (54%)
+ rename drivers/media/{video => pci}/saa7134/saa6752hs.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-alsa.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-cards.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-core.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-dvb.c (99%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-empress.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-i2c.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-input.c (99%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-reg.h (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-ts.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-tvaudio.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-vbi.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-video.c (98%)
+ rename drivers/media/{video => pci}/saa7134/saa7134.h (99%)
+ create mode 100644 drivers/media/pci/saa7146/Kconfig
+ create mode 100644 drivers/media/pci/saa7146/Makefile
+ rename drivers/media/{video => pci/saa7146}/hexium_gemini.c (100%)
+ rename drivers/media/{video => pci/saa7146}/hexium_orion.c (100%)
+ rename drivers/media/{video => pci/saa7146}/mxb.c (99%)
+ rename drivers/media/{video => pci}/saa7164/Kconfig (62%)
+ rename drivers/media/{video => pci}/saa7164/Makefile (57%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-api.c (98%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-buffer.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-bus.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-cards.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-cmd.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-core.c (96%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-dvb.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-encoder.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-fw.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-i2c.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-reg.h (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-types.h (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-vbi.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164.h (99%)
+ create mode 100644 drivers/media/pci/sta2x11/Kconfig
+ create mode 100644 drivers/media/pci/sta2x11/Makefile
+ rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.c (100%)
+ rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/Kconfig (66%)
+ rename drivers/media/{dvb => pci}/ttpci/Makefile (82%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_av.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_av.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ca.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ca.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_hw.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_hw.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ir.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_v4l.c (99%)
+ rename drivers/media/{dvb => pci}/ttpci/budget-av.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/budget-ci.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/budget-core.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/budget-patch.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/budget.c (91%)
+ rename drivers/media/{dvb => pci}/ttpci/budget.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h (100%)
+ rename drivers/media/{video => pci}/zoran/Kconfig (71%)
+ rename drivers/media/{video => pci}/zoran/Makefile (100%)
+ rename drivers/media/{video => pci}/zoran/videocodec.c (100%)
+ rename drivers/media/{video => pci}/zoran/videocodec.h (100%)
+ rename drivers/media/{video => pci}/zoran/zoran.h (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_card.c (99%)
+ rename drivers/media/{video => pci}/zoran/zoran_card.h (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_device.c (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_device.h (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_driver.c (99%)
+ rename drivers/media/{video => pci}/zoran/zoran_procfs.c (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_procfs.h (100%)
+ rename drivers/media/{video => pci}/zoran/zr36016.c (100%)
+ rename drivers/media/{video => pci}/zoran/zr36016.h (100%)
+ rename drivers/media/{video => pci}/zoran/zr36050.c (100%)
+ rename drivers/media/{video => pci}/zoran/zr36050.h (100%)
+ rename drivers/media/{video => pci}/zoran/zr36057.h (100%)
+ rename drivers/media/{video => pci}/zoran/zr36060.c (100%)
+ rename drivers/media/{video => pci}/zoran/zr36060.h (100%)
+ create mode 100644 drivers/media/platform/Kconfig
+ create mode 100644 drivers/media/platform/Makefile
+ rename drivers/media/{video => platform}/arv.c (100%)
+ rename drivers/media/{video => platform}/blackfin/Kconfig (100%)
+ rename drivers/media/{video => platform}/blackfin/Makefile (100%)
+ rename drivers/media/{video => platform}/blackfin/bfin_capture.c (98%)
+ rename drivers/media/{video => platform}/blackfin/ppi.c (100%)
+ create mode 100644 drivers/media/platform/coda.c
+ create mode 100644 drivers/media/platform/coda.h
+ rename drivers/media/{video => platform}/davinci/Kconfig (97%)
+ rename drivers/media/{video => platform}/davinci/Makefile (100%)
+ rename drivers/media/{video => platform}/davinci/ccdc_hw_device.h (100%)
+ rename drivers/media/{video => platform}/davinci/dm355_ccdc.c (99%)
+ rename drivers/media/{video => platform}/davinci/dm355_ccdc_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/dm644x_ccdc.c (99%)
+ rename drivers/media/{video => platform}/davinci/dm644x_ccdc_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/isif.c (99%)
+ rename drivers/media/{video => platform}/davinci/isif_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe.c (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe_display.c (98%)
+ rename drivers/media/{video => platform}/davinci/vpbe_osd.c (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe_osd_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe_venc.c (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe_venc_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/vpfe_capture.c (99%)
+ rename drivers/media/{video => platform}/davinci/vpif.c (96%)
+ rename drivers/media/{video => platform}/davinci/vpif.h (99%)
+ rename drivers/media/{video => platform}/davinci/vpif_capture.c (95%)
+ rename drivers/media/{video => platform}/davinci/vpif_capture.h (98%)
+ rename drivers/media/{video => platform}/davinci/vpif_display.c (94%)
+ rename drivers/media/{video => platform}/davinci/vpif_display.h (98%)
+ rename drivers/media/{video => platform}/davinci/vpss.c (99%)
+ create mode 100644 drivers/media/platform/exynos-gsc/Makefile
+ create mode 100644 drivers/media/platform/exynos-gsc/gsc-core.c
+ create mode 100644 drivers/media/platform/exynos-gsc/gsc-core.h
+ create mode 100644 drivers/media/platform/exynos-gsc/gsc-m2m.c
+ create mode 100644 drivers/media/platform/exynos-gsc/gsc-regs.c
+ create mode 100644 drivers/media/platform/exynos-gsc/gsc-regs.h
+ rename drivers/media/{video => platform}/fsl-viu.c (98%)
+ rename drivers/media/{video => platform}/indycam.c (100%)
+ rename drivers/media/{video => platform}/indycam.h (100%)
+ create mode 100644 drivers/media/platform/m2m-deinterlace.c
+ rename drivers/media/{video => platform}/marvell-ccic/Kconfig (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/Makefile (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/cafe-driver.c (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/mcam-core.c (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/mcam-core.h (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/mmp-driver.c (100%)
+ rename drivers/media/{video => platform}/mem2mem_testdev.c (97%)
+ rename drivers/media/{video => platform}/mx2_emmaprp.c (94%)
+ rename drivers/media/{video => platform}/omap/Kconfig (100%)
+ rename drivers/media/{video => platform}/omap/Makefile (81%)
+ rename drivers/media/{video => platform}/omap/omap_vout.c (99%)
+ rename drivers/media/{video => platform}/omap/omap_vout_vrfb.c (100%)
+ rename drivers/media/{video => platform}/omap/omap_vout_vrfb.h (100%)
+ rename drivers/media/{video => platform}/omap/omap_voutdef.h (100%)
+ rename drivers/media/{video => platform}/omap/omap_voutlib.c (100%)
+ rename drivers/media/{video => platform}/omap/omap_voutlib.h (100%)
+ rename drivers/media/{video => platform}/omap24xxcam-dma.c (99%)
+ rename drivers/media/{video => platform}/omap24xxcam.c (99%)
+ rename drivers/media/{video => platform}/omap24xxcam.h (99%)
+ rename drivers/media/{video => platform}/omap3isp/Makefile (100%)
+ rename drivers/media/{video => platform}/omap3isp/cfa_coef_table.h (91%)
+ rename drivers/media/{video => platform}/omap3isp/gamma_table.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/isp.c (98%)
+ rename drivers/media/{video => platform}/omap3isp/isp.h (97%)
+ rename drivers/media/{video => platform}/omap3isp/ispccdc.c (93%)
+ rename drivers/media/{video => platform}/omap3isp/ispccdc.h (83%)
+ rename drivers/media/{video => platform}/omap3isp/ispccp2.c (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispccp2.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispcsi2.c (98%)
+ rename drivers/media/{video => platform}/omap3isp/ispcsi2.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispcsiphy.c (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispcsiphy.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/isph3a.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/isph3a_aewb.c (96%)
+ rename drivers/media/{video => platform}/omap3isp/isph3a_af.c (96%)
+ rename drivers/media/{video => platform}/omap3isp/isphist.c (98%)
+ rename drivers/media/{video => platform}/omap3isp/isphist.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/isppreview.c (89%)
+ rename drivers/media/{video => platform}/omap3isp/isppreview.h (99%)
+ rename drivers/media/{video => platform}/omap3isp/ispqueue.c (98%)
+ rename drivers/media/{video => platform}/omap3isp/ispqueue.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispreg.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispresizer.c (99%)
+ rename drivers/media/{video => platform}/omap3isp/ispresizer.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispstat.c (99%)
+ rename drivers/media/{video => platform}/omap3isp/ispstat.h (97%)
+ rename drivers/media/{video => platform}/omap3isp/ispvideo.c (96%)
+ rename drivers/media/{video => platform}/omap3isp/ispvideo.h (97%)
+ rename drivers/media/{video => platform}/omap3isp/luma_enhance_table.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/noise_filter_table.h (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/Kconfig (96%)
+ rename drivers/media/{video => platform}/s5p-fimc/Makefile (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-capture.c (97%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-core.c (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-core.h (99%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.c (97%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.h (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.c (97%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.h (97%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-m2m.c (95%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.c (92%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.h (83%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.c (99%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.h (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.c (82%)
+ rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.h (100%)
+ rename drivers/media/{video => platform}/s5p-g2d/Makefile (100%)
+ rename drivers/media/{video => platform}/s5p-g2d/g2d-hw.c (100%)
+ rename drivers/media/{video => platform}/s5p-g2d/g2d-regs.h (100%)
+ rename drivers/media/{video => platform}/s5p-g2d/g2d.c (96%)
+ rename drivers/media/{video => platform}/s5p-g2d/g2d.h (100%)
+ rename drivers/media/{video => platform}/s5p-jpeg/Makefile (100%)
+ rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.c (98%)
+ rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.h (98%)
+ rename drivers/media/{video => platform}/s5p-jpeg/jpeg-hw.h (99%)
+ rename drivers/media/{video => platform}/s5p-jpeg/jpeg-regs.h (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/Makefile (100%)
+ rename drivers/media/{video => platform}/s5p-mfc/regs-mfc.h (100%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc.c (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.c (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_common.h (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.c (95%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_debug.h (95%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.c (97%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.c (95%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.c (97%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.c (97%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.h (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.c (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.h (92%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.c (96%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.h (98%)
+ rename drivers/media/{video => platform}/s5p-tv/Kconfig (98%)
+ rename drivers/media/{video => platform}/s5p-tv/Makefile (92%)
+ rename drivers/media/{video => platform}/s5p-tv/hdmi_drv.c (99%)
+ rename drivers/media/{video => platform}/s5p-tv/hdmiphy_drv.c (100%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer.h (100%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_drv.c (98%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_grp_layer.c (100%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_reg.c (100%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_video.c (97%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_vp_layer.c (100%)
+ rename drivers/media/{video => platform}/s5p-tv/regs-hdmi.h (100%)
+ rename drivers/media/{video => platform}/s5p-tv/regs-mixer.h (100%)
+ rename drivers/media/{video => platform}/s5p-tv/regs-sdo.h (97%)
+ rename drivers/media/{video => platform}/s5p-tv/regs-vp.h (100%)
+ rename drivers/media/{video => platform}/s5p-tv/sdo_drv.c (98%)
+ rename drivers/media/{video => platform}/s5p-tv/sii9234_drv.c (97%)
+ rename drivers/media/{video => platform}/sh_vou.c (97%)
+ create mode 100644 drivers/media/platform/soc_camera/Kconfig
+ create mode 100644 drivers/media/platform/soc_camera/Makefile
+ rename drivers/media/{video => platform/soc_camera}/atmel-isi.c (100%)
+ rename drivers/media/{video => platform/soc_camera}/mx1_camera.c (100%)
+ rename drivers/media/{video => platform/soc_camera}/mx2_camera.c (93%)
+ rename drivers/media/{video => platform/soc_camera}/mx3_camera.c (99%)
+ rename drivers/media/{video => platform/soc_camera}/omap1_camera.c (99%)
+ rename drivers/media/{video => platform/soc_camera}/pxa_camera.c (100%)
+ rename drivers/media/{video => platform/soc_camera}/sh_mobile_ceu_camera.c (99%)
+ rename drivers/media/{video => platform/soc_camera}/sh_mobile_csi2.c (100%)
+ rename drivers/media/{video => platform/soc_camera}/soc_camera.c (91%)
+ rename drivers/media/{video => platform/soc_camera}/soc_camera_platform.c (94%)
+ rename drivers/media/{video => platform/soc_camera}/soc_mediabus.c (100%)
+ rename drivers/media/{video => platform}/timblogiw.c (100%)
+ rename drivers/media/{video => platform}/via-camera.c (100%)
+ rename drivers/media/{video => platform}/via-camera.h (100%)
+ rename drivers/media/{video => platform}/vino.c (99%)
+ rename drivers/media/{video => platform}/vino.h (100%)
+ rename drivers/media/{video => platform}/vivi.c (97%)
+ create mode 100644 drivers/media/rc/ir-rx51.c
+ create mode 100644 drivers/media/rc/ttusbir.c
+ rename drivers/media/{common => }/tuners/Kconfig (72%)
+ rename drivers/media/{common => }/tuners/Makefile (88%)
+ create mode 100644 drivers/media/tuners/e4000.c
+ create mode 100644 drivers/media/tuners/e4000.h
+ create mode 100644 drivers/media/tuners/e4000_priv.h
+ rename drivers/media/{common => }/tuners/fc0011.c (100%)
+ rename drivers/media/{common => }/tuners/fc0011.h (100%)
+ rename drivers/media/{common => }/tuners/fc0012-priv.h (100%)
+ rename drivers/media/{common => }/tuners/fc0012.c (100%)
+ rename drivers/media/{common => }/tuners/fc0012.h (100%)
+ rename drivers/media/{common => }/tuners/fc0013-priv.h (100%)
+ rename drivers/media/{common => }/tuners/fc0013.c (100%)
+ rename drivers/media/{common => }/tuners/fc0013.h (100%)
+ rename drivers/media/{common => }/tuners/fc001x-common.h (100%)
+ create mode 100644 drivers/media/tuners/fc2580.c
+ create mode 100644 drivers/media/tuners/fc2580.h
+ create mode 100644 drivers/media/tuners/fc2580_priv.h
+ rename drivers/media/{common => }/tuners/max2165.c (100%)
+ rename drivers/media/{common => }/tuners/max2165.h (100%)
+ rename drivers/media/{common => }/tuners/max2165_priv.h (100%)
+ rename drivers/media/{common => }/tuners/mc44s803.c (97%)
+ rename drivers/media/{common => }/tuners/mc44s803.h (100%)
+ rename drivers/media/{common => }/tuners/mc44s803_priv.h (100%)
+ rename drivers/media/{common => }/tuners/mt2060.c (100%)
+ rename drivers/media/{common => }/tuners/mt2060.h (100%)
+ rename drivers/media/{common => }/tuners/mt2060_priv.h (100%)
+ rename drivers/media/{common => }/tuners/mt2063.c (100%)
+ rename drivers/media/{common => }/tuners/mt2063.h (100%)
+ rename drivers/media/{common => }/tuners/mt20xx.c (100%)
+ rename drivers/media/{common => }/tuners/mt20xx.h (100%)
+ rename drivers/media/{common => }/tuners/mt2131.c (100%)
+ rename drivers/media/{common => }/tuners/mt2131.h (100%)
+ rename drivers/media/{common => }/tuners/mt2131_priv.h (100%)
+ rename drivers/media/{common => }/tuners/mt2266.c (100%)
+ rename drivers/media/{common => }/tuners/mt2266.h (100%)
+ rename drivers/media/{common => }/tuners/mxl5005s.c (99%)
+ rename drivers/media/{common => }/tuners/mxl5005s.h (100%)
+ rename drivers/media/{common => }/tuners/mxl5007t.c (100%)
+ rename drivers/media/{common => }/tuners/mxl5007t.h (100%)
+ rename drivers/media/{common => }/tuners/qt1010.c (90%)
+ rename drivers/media/{common => }/tuners/qt1010.h (100%)
+ rename drivers/media/{common => }/tuners/qt1010_priv.h (100%)
+ rename drivers/media/{common => }/tuners/tda18212.c (91%)
+ rename drivers/media/{common => }/tuners/tda18212.h (100%)
+ rename drivers/media/{common => }/tuners/tda18218.c (87%)
+ rename drivers/media/{common => }/tuners/tda18218.h (100%)
+ rename drivers/media/{common => }/tuners/tda18218_priv.h (90%)
+ rename drivers/media/{common => }/tuners/tda18271-common.c (99%)
+ rename drivers/media/{common => }/tuners/tda18271-fe.c (98%)
+ rename drivers/media/{common => }/tuners/tda18271-maps.c (100%)
+ rename drivers/media/{common => }/tuners/tda18271-priv.h (100%)
+ rename drivers/media/{common => }/tuners/tda18271.h (95%)
+ rename drivers/media/{common => }/tuners/tda827x.c (100%)
+ rename drivers/media/{common => }/tuners/tda827x.h (100%)
+ rename drivers/media/{common => }/tuners/tda8290.c (100%)
+ rename drivers/media/{common => }/tuners/tda8290.h (100%)
+ rename drivers/media/{common => }/tuners/tda9887.c (100%)
+ rename drivers/media/{common => }/tuners/tda9887.h (100%)
+ rename drivers/media/{common => }/tuners/tea5761.c (100%)
+ rename drivers/media/{common => }/tuners/tea5761.h (100%)
+ rename drivers/media/{common => }/tuners/tea5767.c (100%)
+ rename drivers/media/{common => }/tuners/tea5767.h (100%)
+ rename drivers/media/{common => }/tuners/tua9001.c (65%)
+ rename drivers/media/{common => }/tuners/tua9001.h (78%)
+ rename drivers/media/{common => }/tuners/tua9001_priv.h (100%)
+ rename drivers/media/{common => }/tuners/tuner-i2c.h (100%)
+ rename drivers/media/{common => }/tuners/tuner-simple.c (100%)
+ rename drivers/media/{common => }/tuners/tuner-simple.h (100%)
+ rename drivers/media/{common => }/tuners/tuner-types.c (100%)
+ rename drivers/media/{common => }/tuners/tuner-xc2028-types.h (100%)
+ rename drivers/media/{common => }/tuners/tuner-xc2028.c (99%)
+ rename drivers/media/{common => }/tuners/tuner-xc2028.h (100%)
+ rename drivers/media/{common => }/tuners/xc4000.c (99%)
+ rename drivers/media/{common => }/tuners/xc4000.h (100%)
+ rename drivers/media/{common => }/tuners/xc5000.c (88%)
+ rename drivers/media/{common => }/tuners/xc5000.h (100%)
+ create mode 100644 drivers/media/usb/Kconfig
+ create mode 100644 drivers/media/usb/Makefile
+ rename drivers/media/{video => usb}/au0828/Kconfig (54%)
+ rename drivers/media/{video => usb}/au0828/Makefile (59%)
+ rename drivers/media/{video => usb}/au0828/au0828-cards.c (99%)
+ rename drivers/media/{video => usb}/au0828/au0828-cards.h (100%)
+ rename drivers/media/{video => usb}/au0828/au0828-core.c (85%)
+ rename drivers/media/{video => usb}/au0828/au0828-dvb.c (90%)
+ rename drivers/media/{video => usb}/au0828/au0828-i2c.c (93%)
+ rename drivers/media/{video => usb}/au0828/au0828-reg.h (98%)
+ rename drivers/media/{video => usb}/au0828/au0828-vbi.c (100%)
+ rename drivers/media/{video => usb}/au0828/au0828-video.c (96%)
+ rename drivers/media/{video => usb}/au0828/au0828.h (98%)
+ create mode 100644 drivers/media/usb/b2c2/Kconfig
+ create mode 100644 drivers/media/usb/b2c2/Makefile
+ rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.c (99%)
+ rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.h (100%)
+ rename drivers/media/{video => usb}/cpia2/Kconfig (100%)
+ rename drivers/media/{video => usb}/cpia2/Makefile (100%)
+ rename drivers/media/{video => usb}/cpia2/cpia2.h (100%)
+ rename drivers/media/{video => usb}/cpia2/cpia2_core.c (99%)
+ rename drivers/media/{video => usb}/cpia2/cpia2_registers.h (100%)
+ rename drivers/media/{video => usb}/cpia2/cpia2_usb.c (100%)
+ rename drivers/media/{video => usb}/cpia2/cpia2_v4l.c (97%)
+ rename drivers/media/{video => usb}/cx231xx/Kconfig (86%)
+ rename drivers/media/{video => usb}/cx231xx/Makefile (65%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-417.c (99%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-audio.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-avcore.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-cards.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-conf-reg.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-core.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-dif.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-input.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-reg.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-video.c (98%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx.h (100%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/Kconfig
+ create mode 100644 drivers/media/usb/dvb-usb-v2/Makefile
+ create mode 100644 drivers/media/usb/dvb-usb-v2/af9015.c
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h (78%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c (57%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h (93%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c (67%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h (97%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c (64%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h (80%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c (63%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c (58%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h (58%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.c
+ create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.h
+ create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb.h
+ create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
+ create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+ create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c (57%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h (62%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c (54%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h (59%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/it913x.c
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c (69%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c (99%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h (100%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/mxl111sf.c
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h (98%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c (62%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h (91%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/usb_urb.c
+ create mode 100644 drivers/media/usb/dvb-usb/Kconfig
+ create mode 100644 drivers/media/usb/dvb-usb/Makefile
+ rename drivers/media/{dvb => usb}/dvb-usb/a800.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005-script.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/az6027.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/az6027.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-core.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cxusb.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cxusb.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dib0700.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c (99%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dib0700_devices.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dib07x0.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dibusb.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/digitv.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/digitv.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-common.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c (99%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-remote.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h (99%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dw2102.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dw2102.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/friio-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/friio.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/friio.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/m920x.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/m920x.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/opera1.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/pctv452e.c (99%)
+ rename drivers/media/{dvb => usb}/dvb-usb/technisat-usb2.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.c (99%)
+ rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/umt-010.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/usb-urb.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp702x.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp702x.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp7045.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp7045.h (100%)
+ rename drivers/media/{video => usb}/em28xx/Kconfig (67%)
+ rename drivers/media/{video => usb}/em28xx/Makefile (57%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-audio.c (99%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-cards.c (99%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-core.c (99%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-dvb.c (95%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-i2c.c (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-input.c (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-reg.h (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-vbi.c (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-video.c (98%)
+ rename drivers/media/{video => usb}/em28xx/em28xx.h (100%)
+ rename drivers/media/{video => usb}/gspca/Kconfig (98%)
+ rename drivers/media/{video => usb}/gspca/Makefile (100%)
+ rename drivers/media/{video => usb}/gspca/autogain_functions.c (100%)
+ rename drivers/media/{video => usb}/gspca/autogain_functions.h (100%)
+ rename drivers/media/{video => usb}/gspca/benq.c (100%)
+ rename drivers/media/{video => usb}/gspca/conex.c (100%)
+ rename drivers/media/{video => usb}/gspca/cpia1.c (99%)
+ rename drivers/media/{video => usb}/gspca/etoms.c (100%)
+ rename drivers/media/{video => usb}/gspca/finepix.c (92%)
+ rename drivers/media/{video => usb}/gspca/gl860/Kconfig (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/Makefile (75%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860-mi1320.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860-mi2020.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860-ov2640.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860-ov9655.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860.h (100%)
+ rename drivers/media/{video => usb}/gspca/gspca.c (99%)
+ rename drivers/media/{video => usb}/gspca/gspca.h (97%)
+ rename drivers/media/{video => usb}/gspca/jeilinj.c (99%)
+ rename drivers/media/{video => usb}/gspca/jl2005bcd.c (95%)
+ rename drivers/media/{video => usb}/gspca/jpeg.h (100%)
+ rename drivers/media/{video => usb}/gspca/kinect.c (100%)
+ rename drivers/media/{video => usb}/gspca/konica.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/Kconfig (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/Makefile (80%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_bridge.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_core.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_sensor.h (100%)
+ rename drivers/media/{video => usb}/gspca/mars.c (100%)
+ rename drivers/media/{video => usb}/gspca/mr97310a.c (100%)
+ rename drivers/media/{video => usb}/gspca/nw80x.c (100%)
+ rename drivers/media/{video => usb}/gspca/ov519.c (99%)
+ rename drivers/media/{video => usb}/gspca/ov534.c (100%)
+ rename drivers/media/{video => usb}/gspca/ov534_9.c (100%)
+ rename drivers/media/{video => usb}/gspca/pac207.c (100%)
+ rename drivers/media/{video => usb}/gspca/pac7302.c (95%)
+ rename drivers/media/{video => usb}/gspca/pac7311.c (100%)
+ rename drivers/media/{video => usb}/gspca/pac_common.h (100%)
+ rename drivers/media/{video => usb}/gspca/se401.c (100%)
+ rename drivers/media/{video => usb}/gspca/se401.h (100%)
+ rename drivers/media/{video => usb}/gspca/sn9c2028.c (100%)
+ rename drivers/media/{video => usb}/gspca/sn9c2028.h (100%)
+ rename drivers/media/{video => usb}/gspca/sn9c20x.c (99%)
+ rename drivers/media/{video => usb}/gspca/sonixb.c (100%)
+ rename drivers/media/{video => usb}/gspca/sonixj.c (99%)
+ rename drivers/media/{video => usb}/gspca/spca1528.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca500.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca501.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca505.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca506.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca508.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca561.c (100%)
+ rename drivers/media/{video => usb}/gspca/sq905.c (95%)
+ rename drivers/media/{video => usb}/gspca/sq905c.c (91%)
+ rename drivers/media/{video => usb}/gspca/sq930x.c (99%)
+ rename drivers/media/{video => usb}/gspca/stk014.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv0680.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/Kconfig (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/Makefile (78%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_sensor.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.h (100%)
+ rename drivers/media/{video => usb}/gspca/sunplus.c (100%)
+ rename drivers/media/{video => usb}/gspca/t613.c (100%)
+ rename drivers/media/{video => usb}/gspca/topro.c (99%)
+ rename drivers/media/{video => usb}/gspca/tv8532.c (100%)
+ rename drivers/media/{video => usb}/gspca/vc032x.c (99%)
+ rename drivers/media/{video => usb}/gspca/vicam.c (94%)
+ rename drivers/media/{video => usb}/gspca/w996Xcf.c (100%)
+ rename drivers/media/{video => usb}/gspca/xirlink_cit.c (99%)
+ rename drivers/media/{video => usb}/gspca/zc3xx-reg.h (100%)
+ rename drivers/media/{video => usb}/gspca/zc3xx.c (99%)
+ rename drivers/media/{video => usb}/hdpvr/Kconfig (100%)
+ rename drivers/media/{video => usb}/hdpvr/Makefile (81%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr-control.c (100%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr-core.c (100%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c (100%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr-video.c (99%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/Kconfig (82%)
+ rename drivers/media/{video => usb}/pvrusb2/Makefile (80%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debug.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.c (97%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw-internal.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-main.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-util.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.c (99%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2.h (100%)
+ rename drivers/media/{video => usb}/pwc/Kconfig (100%)
+ rename drivers/media/{video => usb}/pwc/Makefile (60%)
+ rename drivers/media/{video => usb}/pwc/philips.txt (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-ctrl.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-dec1.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-dec1.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-dec23.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-dec23.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-if.c (99%)
+ rename drivers/media/{video => usb}/pwc/pwc-kiara.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-kiara.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-misc.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-nala.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-timon.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-timon.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-uncompress.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-v4l.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc.h (100%)
+ create mode 100644 drivers/media/usb/s2255/Kconfig
+ create mode 100644 drivers/media/usb/s2255/Makefile
+ rename drivers/media/{video => usb/s2255}/s2255drv.c (99%)
+ create mode 100644 drivers/media/usb/siano/Kconfig
+ create mode 100644 drivers/media/usb/siano/Makefile
+ rename drivers/media/{dvb => usb}/siano/smsusb.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/Kconfig (100%)
+ rename drivers/media/{video => usb}/sn9c102/Makefile (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102.h (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_config.h (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_core.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_devtable.h (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131d.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131r.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0343.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0360.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_mt9v111.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7630.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7660.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_pas106b.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_pas202bcb.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_sensor.h (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110c1b.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110d.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5130d1b.c (100%)
+ create mode 100644 drivers/media/usb/stk1160/Kconfig
+ create mode 100644 drivers/media/usb/stk1160/Makefile
+ create mode 100644 drivers/media/usb/stk1160/stk1160-ac97.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160-core.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160-i2c.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160-reg.h
+ create mode 100644 drivers/media/usb/stk1160/stk1160-v4l.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160-video.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160.h
+ create mode 100644 drivers/media/usb/stkwebcam/Kconfig
+ create mode 100644 drivers/media/usb/stkwebcam/Makefile
+ rename drivers/media/{video => usb/stkwebcam}/stk-sensor.c (100%)
+ rename drivers/media/{video => usb/stkwebcam}/stk-webcam.c (100%)
+ rename drivers/media/{video => usb/stkwebcam}/stk-webcam.h (100%)
+ rename drivers/media/{video => usb}/tlg2300/Kconfig (100%)
+ create mode 100644 drivers/media/usb/tlg2300/Makefile
+ rename drivers/media/{video => usb}/tlg2300/pd-alsa.c (99%)
+ rename drivers/media/{video => usb}/tlg2300/pd-common.h (100%)
+ rename drivers/media/{video => usb}/tlg2300/pd-dvb.c (100%)
+ rename drivers/media/{video => usb}/tlg2300/pd-main.c (100%)
+ rename drivers/media/{video => usb}/tlg2300/pd-radio.c (99%)
+ rename drivers/media/{video => usb}/tlg2300/pd-video.c (99%)
+ rename drivers/media/{video => usb}/tlg2300/vendorcmds.h (100%)
+ rename drivers/media/{video => usb}/tm6000/Kconfig (100%)
+ rename drivers/media/{video => usb}/tm6000/Makefile (62%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-alsa.c (99%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-cards.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-core.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-dvb.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-i2c.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-input.c (99%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-regs.h (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-stds.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-usb-isoc.h (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-video.c (97%)
+ rename drivers/media/{video => usb}/tm6000/tm6000.h (100%)
+ rename drivers/media/{dvb => usb}/ttusb-budget/Kconfig (56%)
+ create mode 100644 drivers/media/usb/ttusb-budget/Makefile
+ rename drivers/media/{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c (100%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/Kconfig (100%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/Makefile (57%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c (100%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c (100%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h (100%)
+ rename drivers/media/{video => usb}/usbvision/Kconfig (88%)
+ rename drivers/media/{video => usb}/usbvision/Makefile (63%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-cards.c (100%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-cards.h (100%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-core.c (100%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-i2c.c (100%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-video.c (97%)
+ rename drivers/media/{video => usb}/usbvision/usbvision.h (100%)
+ rename drivers/media/{video => usb}/uvc/Kconfig (100%)
+ rename drivers/media/{video => usb}/uvc/Makefile (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_ctrl.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_debugfs.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_driver.c (98%)
+ rename drivers/media/{video => usb}/uvc/uvc_entity.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_isight.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_queue.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_status.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_v4l2.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_video.c (98%)
+ rename drivers/media/{video => usb}/uvc/uvcvideo.h (98%)
+ create mode 100644 drivers/media/usb/zr364xx/Kconfig
+ create mode 100644 drivers/media/usb/zr364xx/Makefile
+ rename drivers/media/{video => usb/zr364xx}/zr364xx.c (100%)
+ create mode 100644 drivers/media/v4l2-core/Kconfig
+ create mode 100644 drivers/media/v4l2-core/Makefile
+ rename drivers/media/{video => v4l2-core}/tuner-core.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-common.c (62%)
+ rename drivers/media/{video => v4l2-core}/v4l2-compat-ioctl32.c (94%)
+ rename drivers/media/{video => v4l2-core}/v4l2-ctrls.c (94%)
+ rename drivers/media/{video => v4l2-core}/v4l2-dev.c (79%)
+ rename drivers/media/{video => v4l2-core}/v4l2-device.c (99%)
+ rename drivers/media/{video => v4l2-core}/v4l2-event.c (98%)
+ rename drivers/media/{video => v4l2-core}/v4l2-fh.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-int-device.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-ioctl.c (92%)
+ rename drivers/media/{video => v4l2-core}/v4l2-mem2mem.c (98%)
+ rename drivers/media/{video => v4l2-core}/v4l2-subdev.c (98%)
+ rename drivers/media/{video => v4l2-core}/videobuf-core.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf-dma-contig.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf-dma-sg.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf-dvb.c (96%)
+ rename drivers/media/{video => v4l2-core}/videobuf-vmalloc.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-core.c (98%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-dma-contig.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-dma-sg.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-memops.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-vmalloc.c (99%)
+ delete mode 100644 drivers/media/video/Kconfig
+ delete mode 100644 drivers/media/video/Makefile
+ delete mode 100644 drivers/media/video/bt8xx/Kconfig
+ delete mode 100644 drivers/media/video/bt8xx/Makefile
+ delete mode 100644 drivers/media/video/cx23885/Kconfig
+ delete mode 100644 drivers/media/video/tlg2300/Makefile
+ delete mode 100644 drivers/mfd/anatop-mfd.c
+ create mode 100644 drivers/mfd/da9055-core.c
+ create mode 100644 drivers/mfd/da9055-i2c.c
+ create mode 100644 drivers/mfd/lp8788-irq.c
+ create mode 100644 drivers/mfd/lp8788.c
+ create mode 100644 drivers/mfd/max8907.c
+ create mode 100644 drivers/mfd/omap-usb-tll.c
+ create mode 100644 drivers/mfd/smsc-ece1099.c
+ create mode 100644 drivers/mfd/syscon.c
+ create mode 100644 drivers/pinctrl/pinctrl-armada-370.c
+ create mode 100644 drivers/pinctrl/pinctrl-armada-xp.c
+ create mode 100644 drivers/pinctrl/pinctrl-dove.c
+ create mode 100644 drivers/pinctrl/pinctrl-kirkwood.c
+ create mode 100644 drivers/pinctrl/pinctrl-mvebu.c
+ create mode 100644 drivers/pinctrl/pinctrl-mvebu.h
+ create mode 100644 drivers/power/88pm860x_battery.c
+ create mode 100644 drivers/power/88pm860x_charger.c
+ create mode 100644 drivers/power/lp8788-charger.c
+ rename drivers/{mfd/twl6030-pwm.c => pwm/pwm-twl6030.c} (55%)
+ create mode 100644 drivers/rtc/rtc-ds2404.c
+ create mode 100644 drivers/rtc/rtc-max8907.c
+ create mode 100644 drivers/rtc/rtc-rc5t583.c
+ create mode 100644 drivers/rtc/rtc-snvs.c
+ create mode 100644 drivers/rtc/rtc-tps65910.c
+ delete mode 100644 drivers/staging/media/easycap/Kconfig
+ delete mode 100644 drivers/staging/media/easycap/Makefile
+ delete mode 100644 drivers/staging/media/easycap/README
+ delete mode 100644 drivers/staging/media/easycap/easycap.h
+ delete mode 100644 drivers/staging/media/easycap/easycap_ioctl.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_low.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_main.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_settings.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_sound.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_testcard.c
+ delete mode 100644 drivers/staging/media/lirc/lirc_ene0100.h
+ delete mode 100644 drivers/staging/media/lirc/lirc_ttusbir.c
+ create mode 100644 drivers/video/backlight/lm3630_bl.c
+ create mode 100644 drivers/video/backlight/lm3639_bl.c
+ delete mode 100644 drivers/video/backlight/progear_bl.c
+ create mode 100644 drivers/video/backlight/tps65217_bl.c
+ create mode 100644 fs/coredump.h
+ create mode 100644 fs/fat/nfs.c
+ create mode 100644 include/acpi/acbuffer.h
+ create mode 100644 include/linux/mfd/ab3100.h
+ delete mode 100644 include/linux/mfd/anatop.h
+ create mode 100644 include/linux/mfd/da9055/core.h
+ create mode 100644 include/linux/mfd/da9055/pdata.h
+ create mode 100644 include/linux/mfd/da9055/reg.h
+ create mode 100644 include/linux/mfd/lp8788-isink.h
+ create mode 100644 include/linux/mfd/lp8788.h
+ create mode 100644 include/linux/mfd/max8907.h
+ create mode 100644 include/linux/mfd/smsc.h
+ create mode 100644 include/linux/mfd/syscon.h
+ create mode 100644 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+ create mode 100644 include/linux/platform_data/lm3630_bl.h
+ create mode 100644 include/linux/platform_data/lm3639_bl.h
+ create mode 100644 include/linux/rtc-ds2404.h
+ create mode 100644 include/linux/v4l2-controls.h
+ create mode 100644 include/media/ad9389b.h
+ create mode 100644 include/media/adv7604.h
+ create mode 100644 include/media/ir-rx51.h
+ create mode 100644 include/media/s5k4ecgx.h
+ create mode 100644 tools/power/acpi/Makefile
+ create mode 100644 tools/power/acpi/acpidump.8
+ create mode 100644 tools/power/acpi/acpidump.c
+ create mode 100644 tools/testing/selftests/epoll/Makefile
+ create mode 100644 tools/testing/selftests/epoll/test_epoll.c
+ create mode 100644 tools/virtio/virtio-trace/Makefile
+ create mode 100644 tools/virtio/virtio-trace/README
+ create mode 100644 tools/virtio/virtio-trace/trace-agent-ctl.c
+ create mode 100644 tools/virtio/virtio-trace/trace-agent-rw.c
+ create mode 100644 tools/virtio/virtio-trace/trace-agent.c
+ create mode 100644 tools/virtio/virtio-trace/trace-agent.h
+Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax)
+$ git merge kbuild-current/rc-fixes
+Auto-merging tools/perf/Makefile
+Auto-merging scripts/Kbuild.include
+Auto-merging arch/x86/Makefile
+Merge made by the 'recursive' strategy.
+ arch/mips/Makefile | 2 +-
+ arch/mips/kernel/Makefile | 2 +-
+ arch/x86/Makefile | 4 ++--
+ scripts/Kbuild.include | 12 ++++++------
+ scripts/Makefile.fwinst | 4 ++--
+ scripts/gcc-version.sh | 6 +++---
+ scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
+ scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
+ scripts/kconfig/check.sh | 2 +-
+ scripts/kconfig/lxdialog/check-lxdialog.sh | 2 +-
+ scripts/package/buildtar | 2 +-
+ tools/perf/Makefile | 2 +-
+ tools/power/cpupower/Makefile | 2 +-
+ 13 files changed, 22 insertions(+), 22 deletions(-)
+Merging arm-current/fixes (8ef102c ARM: 7548/1: include linux/sched.h in syscall.h)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (2863bc5 Revert strace hiccups fix.)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/asi.h | 19 ++++++++
+ arch/sparc/kernel/head_64.S | 2 +-
+ arch/sparc/lib/Makefile | 2 +-
+ arch/sparc/lib/NG4clear_page.S | 29 +++++++++++
+ arch/sparc/lib/NG4copy_page.S | 16 +++---
+ arch/sparc/lib/NG4memset.S | 105 ++++++++++++++++++++++++++++++++++++++++
+ arch/sparc/lib/NG4patch.S | 15 +++++-
+ 7 files changed, 176 insertions(+), 12 deletions(-)
+ create mode 100644 arch/sparc/lib/NG4clear_page.S
+ create mode 100644 arch/sparc/lib/NG4memset.S
+Merging net/master (9545f4e ptp: use list_move instead of list_del/list_add)
+$ git merge net/master
+Auto-merging drivers/infiniband/core/cma.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/cma.c | 3 +-
+ drivers/infiniband/core/netlink.c | 1 +
+ drivers/net/ethernet/amd/amd8111e.c | 2 +
+ drivers/net/ethernet/amd/au1000_eth.c | 10 ++++-
+ drivers/net/ethernet/calxeda/xgmac.c | 19 +--------
+ drivers/net/ethernet/dec/tulip/dmfe.c | 12 ++++--
+ drivers/net/ethernet/freescale/gianfar.c | 27 ++----------
+ drivers/net/ethernet/freescale/gianfar.h | 2 -
+ drivers/net/ethernet/freescale/ucc_geth.c | 29 +++----------
+ drivers/net/ethernet/freescale/ucc_geth.h | 2 -
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 18 +-------
+ drivers/net/ethernet/marvell/skge.c | 4 +-
+ drivers/net/ethernet/marvell/sky2.c | 5 ++-
+ drivers/net/ethernet/natsemi/natsemi.c | 4 +-
+ drivers/net/ethernet/natsemi/xtsonic.c | 1 +
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 1 +
+ drivers/net/ethernet/sfc/ptp.c | 9 ++--
+ drivers/net/ethernet/sis/sis900.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +--------
+ drivers/net/ethernet/sun/niu.c | 1 +
+ drivers/net/ethernet/sun/sungem.c | 3 +-
+ drivers/net/irda/irtty-sir.c | 4 +-
+ drivers/net/irda/mcs7780.c | 4 +-
+ drivers/net/irda/pxaficp_ir.c | 4 +-
+ drivers/net/irda/sa1100_ir.c | 4 +-
+ drivers/net/irda/sh_irda.c | 4 +-
+ drivers/net/irda/sh_sir.c | 5 ++-
+ drivers/net/vxlan.c | 1 -
+ include/linux/netdevice.h | 1 -
+ include/linux/netlink.h | 20 +++++++--
+ include/linux/skbuff.h | 24 -----------
+ include/rdma/rdma_netlink.h | 1 +
+ net/core/dev.c | 14 +++---
+ net/core/neighbour.c | 6 +--
+ net/core/skbuff.c | 47 ---------------------
+ net/ipv6/af_inet6.c | 11 +++--
+ net/netlink/af_netlink.c | 29 +++++++++----
+ 39 files changed, 132 insertions(+), 228 deletions(-)
+Merging sound-current/for-linus (5d037f9 Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (cf193f6 rt2x00/rt3352: Fix lnagain assignment to use register 66.)
+$ git merge wireless/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/ath/ath9k/beacon.c | 2 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 5 +++
+ drivers/net/wireless/ath/ath9k/hw.h | 1 +
+ drivers/net/wireless/ath/ath9k/main.c | 15 +++------
+ drivers/net/wireless/ath/ath9k/pci.c | 7 ++++
+ drivers/net/wireless/ath/ath9k/xmit.c | 53 +++++++++++++++++--------------
+ drivers/net/wireless/rt2x00/rt2800lib.c | 4 +--
+ 7 files changed, 50 insertions(+), 37 deletions(-)
+Merging driver-core.current/driver-core-linus (5698bd7 Linux 3.6-rc6)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (b70936d tty: serial: sccnxp: Fix bug with unterminated platform_id list)
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/staging/dgrp/dgrp_mon_ops.c | 1 +
+ drivers/staging/dgrp/dgrp_specproc.c | 1 +
+ drivers/staging/dgrp/dgrp_tty.c | 1 +
+ drivers/tty/serial/Kconfig | 4 ++--
+ drivers/tty/serial/sccnxp.c | 1 +
+ include/linux/ratelimit.h | 27 +++++++++------------------
+ net/irda/ircomm/ircomm_tty.c | 2 ++
+ 7 files changed, 17 insertions(+), 20 deletions(-)
+Merging usb.current/usb-linus (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (5698bd7 Linux 3.6-rc6)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (dde3ada Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (80b4812 md/raid10: fix "enough" function for detecting if array is failed.)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
+$ git merge irqdomain-current/irqdomain/merge
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
+$ git merge devicetree-current/devicetree/merge
+Auto-merging drivers/of/base.c
+Merge made by the 'recursive' strategy.
+ drivers/of/base.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
+$ git merge spi-current/spi/merge
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/spi/spi-s3c64xx.c
+Auto-merging drivers/spi/spi-bcm63xx.c
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-bcm63xx.c | 16 ++++++----------
+ drivers/spi/spi-s3c64xx.c | 10 ++++------
+ drivers/spi/spi.c | 5 ++++-
+ 3 files changed, 14 insertions(+), 17 deletions(-)
+Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
+$ git merge gpio-current/gpio/merge
+Already up-to-date.
+Merging asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic)
+$ git merge asm-generic/master
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/Kbuild | 2 +
+ arch/avr32/include/asm/Kbuild | 2 +
+ arch/cris/include/asm/Kbuild | 2 +
+ arch/frv/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/Kbuild | 2 +
+ arch/hexagon/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/Kbuild | 2 +
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/mn10300/include/asm/Kbuild | 2 +
+ arch/openrisc/include/asm/Kbuild | 1 +
+ arch/parisc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/s390/include/asm/Kbuild | 2 +
+ arch/score/include/asm/Kbuild | 2 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/tile/include/asm/Kbuild | 1 +
+ arch/um/include/asm/Kbuild | 2 +-
+ arch/unicore32/include/asm/Kbuild | 1 +
+ arch/x86/include/asm/Kbuild | 6 +
+ arch/xtensa/include/asm/Kbuild | 2 +
+ include/asm-generic/Kbuild | 35 -
+ include/asm-generic/bitsperlong.h | 13 +-
+ include/asm-generic/clkdev.h | 28 +
+ include/asm-generic/int-l64.h | 26 +-
+ include/asm-generic/int-ll64.h | 31 +-
+ include/asm-generic/ioctl.h | 95 +--
+ include/asm-generic/kvm_para.h | 5 +-
+ include/asm-generic/param.h | 17 +-
+ include/asm-generic/resource.h | 66 +-
+ include/asm-generic/siginfo.h | 297 +--------
+ include/asm-generic/signal.h | 117 +---
+ include/asm-generic/statfs.h | 81 +--
+ include/asm-generic/termios.h | 49 +-
+ include/asm-generic/unistd.h | 907 +-------------------------
+ include/asm-generic/xor.h | 4 +-
+ include/uapi/asm-generic/Kbuild | 35 +
+ include/{ => uapi}/asm-generic/auxvec.h | 0
+ include/uapi/asm-generic/bitsperlong.h | 15 +
+ include/{ => uapi}/asm-generic/errno-base.h | 0
+ include/{ => uapi}/asm-generic/errno.h | 0
+ include/{ => uapi}/asm-generic/fcntl.h | 0
+ include/uapi/asm-generic/int-l64.h | 34 +
+ include/uapi/asm-generic/int-ll64.h | 39 ++
+ include/uapi/asm-generic/ioctl.h | 98 +++
+ include/{ => uapi}/asm-generic/ioctls.h | 0
+ include/{ => uapi}/asm-generic/ipcbuf.h | 0
+ include/{ => uapi}/asm-generic/mman-common.h | 0
+ include/{ => uapi}/asm-generic/mman.h | 0
+ include/{ => uapi}/asm-generic/msgbuf.h | 0
+ include/uapi/asm-generic/param.h | 19 +
+ include/{ => uapi}/asm-generic/poll.h | 0
+ include/{ => uapi}/asm-generic/posix_types.h | 0
+ include/uapi/asm-generic/resource.h | 68 ++
+ include/{ => uapi}/asm-generic/sembuf.h | 0
+ include/{ => uapi}/asm-generic/setup.h | 0
+ include/{ => uapi}/asm-generic/shmbuf.h | 0
+ include/{ => uapi}/asm-generic/shmparam.h | 0
+ include/uapi/asm-generic/siginfo.h | 298 +++++++++
+ include/{ => uapi}/asm-generic/signal-defs.h | 0
+ include/uapi/asm-generic/signal.h | 123 ++++
+ include/{ => uapi}/asm-generic/socket.h | 0
+ include/{ => uapi}/asm-generic/sockios.h | 0
+ include/{ => uapi}/asm-generic/stat.h | 0
+ include/uapi/asm-generic/statfs.h | 83 +++
+ include/{ => uapi}/asm-generic/swab.h | 0
+ include/{ => uapi}/asm-generic/termbits.h | 0
+ include/uapi/asm-generic/termios.h | 50 ++
+ include/{ => uapi}/asm-generic/types.h | 0
+ include/{ => uapi}/asm-generic/ucontext.h | 0
+ include/uapi/asm-generic/unistd.h | 902 +++++++++++++++++++++++++
+ security/apparmor/Makefile | 2 +-
+ 73 files changed, 1844 insertions(+), 1730 deletions(-)
+ create mode 100644 include/asm-generic/clkdev.h
+ rename include/{ => uapi}/asm-generic/auxvec.h (100%)
+ create mode 100644 include/uapi/asm-generic/bitsperlong.h
+ rename include/{ => uapi}/asm-generic/errno-base.h (100%)
+ rename include/{ => uapi}/asm-generic/errno.h (100%)
+ rename include/{ => uapi}/asm-generic/fcntl.h (100%)
+ create mode 100644 include/uapi/asm-generic/int-l64.h
+ create mode 100644 include/uapi/asm-generic/int-ll64.h
+ create mode 100644 include/uapi/asm-generic/ioctl.h
+ rename include/{ => uapi}/asm-generic/ioctls.h (100%)
+ rename include/{ => uapi}/asm-generic/ipcbuf.h (100%)
+ create mode 100644 include/uapi/asm-generic/kvm_para.h
+ rename include/{ => uapi}/asm-generic/mman-common.h (100%)
+ rename include/{ => uapi}/asm-generic/mman.h (100%)
+ rename include/{ => uapi}/asm-generic/msgbuf.h (100%)
+ create mode 100644 include/uapi/asm-generic/param.h
+ rename include/{ => uapi}/asm-generic/poll.h (100%)
+ rename include/{ => uapi}/asm-generic/posix_types.h (100%)
+ create mode 100644 include/uapi/asm-generic/resource.h
+ rename include/{ => uapi}/asm-generic/sembuf.h (100%)
+ rename include/{ => uapi}/asm-generic/setup.h (100%)
+ rename include/{ => uapi}/asm-generic/shmbuf.h (100%)
+ rename include/{ => uapi}/asm-generic/shmparam.h (100%)
+ create mode 100644 include/uapi/asm-generic/siginfo.h
+ rename include/{ => uapi}/asm-generic/signal-defs.h (100%)
+ create mode 100644 include/uapi/asm-generic/signal.h
+ rename include/{ => uapi}/asm-generic/socket.h (100%)
+ rename include/{ => uapi}/asm-generic/sockios.h (100%)
+ rename include/{ => uapi}/asm-generic/stat.h (100%)
+ create mode 100644 include/uapi/asm-generic/statfs.h
+ rename include/{ => uapi}/asm-generic/swab.h (100%)
+ rename include/{ => uapi}/asm-generic/termbits.h (100%)
+ create mode 100644 include/uapi/asm-generic/termios.h
+ rename include/{ => uapi}/asm-generic/types.h (100%)
+ rename include/{ => uapi}/asm-generic/ucontext.h (100%)
+ create mode 100644 include/uapi/asm-generic/unistd.h
+Merging arm/for-next (f537d06 Merge branch 'devel-stable' into for-next)
+$ git merge arm/for-next
+Resolved 'arch/arm/kernel/smp.c' using previous resolution.
+Auto-merging arch/arm/kernel/smp.c
+CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/kernel/head.S
+Auto-merging arch/arm/kernel/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2b731ff] Merge remote-tracking branch 'arm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/Booting | 22 +++-
+ arch/arm/boot/compressed/.gitignore | 1 +
+ arch/arm/boot/compressed/Makefile | 9 +-
+ arch/arm/boot/compressed/head.S | 71 +++++++++--
+ arch/arm/include/asm/assembler.h | 28 +++++
+ arch/arm/include/asm/cacheflush.h | 15 +++
+ arch/arm/include/asm/glue-cache.h | 1 +
+ arch/arm/include/asm/opcodes-virt.h | 10 ++
+ arch/arm/include/asm/ptrace.h | 1 +
+ arch/arm/include/asm/virt.h | 69 +++++++++++
+ arch/arm/kernel/Makefile | 2 +
+ arch/arm/kernel/head.S | 14 ++-
+ arch/arm/kernel/hyp-stub.S | 223 +++++++++++++++++++++++++++++++++++
+ arch/arm/kernel/setup.c | 20 ++++
+ arch/arm/kernel/smp.c | 8 +-
+ arch/arm/kernel/suspend.c | 17 ++-
+ arch/arm/mm/Kconfig | 17 +++
+ arch/arm/mm/cache-fa.S | 3 +
+ arch/arm/mm/cache-v3.S | 3 +
+ arch/arm/mm/cache-v4.S | 3 +
+ arch/arm/mm/cache-v4wb.S | 3 +
+ arch/arm/mm/cache-v4wt.S | 3 +
+ arch/arm/mm/cache-v6.S | 3 +
+ arch/arm/mm/cache-v7.S | 48 +++++++-
+ arch/arm/mm/proc-arm1020.S | 3 +
+ arch/arm/mm/proc-arm1020e.S | 3 +
+ arch/arm/mm/proc-arm1022.S | 3 +
+ arch/arm/mm/proc-arm1026.S | 3 +
+ arch/arm/mm/proc-arm920.S | 3 +
+ arch/arm/mm/proc-arm922.S | 3 +
+ arch/arm/mm/proc-arm925.S | 3 +
+ arch/arm/mm/proc-arm926.S | 3 +
+ arch/arm/mm/proc-arm940.S | 3 +
+ arch/arm/mm/proc-arm946.S | 3 +
+ arch/arm/mm/proc-feroceon.S | 4 +
+ arch/arm/mm/proc-macros.S | 1 +
+ arch/arm/mm/proc-mohawk.S | 3 +
+ arch/arm/mm/proc-v7.S | 2 +-
+ arch/arm/mm/proc-xsc3.S | 3 +
+ arch/arm/mm/proc-xscale.S | 4 +
+ 40 files changed, 620 insertions(+), 21 deletions(-)
+ create mode 100644 arch/arm/include/asm/virt.h
+ create mode 100644 arch/arm/kernel/hyp-stub.S
+Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
+$ git merge arm-perf/for-next/perf
+Resolved 'arch/arm/kernel/hw_breakpoint.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution.
+Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
+Auto-merging arch/arm/mach-ux500/cpu-db8500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
+CONFLICT (modify/delete): arch/arm/mach-tegra/devices.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-tegra/devices.c left in tree.
+Auto-merging arch/arm/mach-omap2/devices.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
+CONFLICT (modify/delete): arch/arm/mach-bcmring/arch.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-bcmring/arch.c left in tree.
+Auto-merging arch/arm/kernel/hw_breakpoint.c
+CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-tegra/devices.c arch/arm/mach-bcmring/arch.c
+arch/arm/mach-bcmring/arch.c: needs merge
+arch/arm/mach-tegra/devices.c: needs merge
+rm 'arch/arm/mach-bcmring/arch.c'
+rm 'arch/arm/mach-tegra/devices.c'
+$ git commit -v -a
+[master 393d14d] Merge remote-tracking branch 'arm-perf/for-next/perf'
+$ git diff -M --stat --summary HEAD^..
+Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
+$ git merge xilinx/arm-next
+Already up-to-date.
+Merging arm64/upstream (cce72b4 arm64: Use the generic compat_sys_sendfile() implementation)
+$ git merge arm64/upstream
+Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution.
+Auto-merging arch/arm64/include/asm/unistd32.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5a021bc] Merge remote-tracking branch 'arm64/upstream'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm64/include/asm/unistd32.h | 1 +
+ arch/arm64/kernel/sys_compat.c | 20 --------------------
+ arch/arm64/mm/dma-mapping.c | 6 ++----
+ arch/arm64/mm/init.c | 5 +----
+ arch/arm64/mm/mm.h | 1 +
+ 5 files changed, 5 insertions(+), 28 deletions(-)
+Merging blackfin/for-linus (6895f97 kbuild: add symbol prefix arg to kallsyms)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (2e919f7 c6x: remove c6x signal.h)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (d75d806 CRIS: Remove VCS simulator specific code)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (f68301f UAPI: (Scripted) Disintegrate arch/ia64/include/asm)
+$ git merge ia64/next
+Recorded preimage for 'arch/ia64/include/asm/Kbuild'
+Auto-merging arch/ia64/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/ia64/include/asm/Kbuild
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/ia64/include/asm/Kbuild'.
+[master 07f3cbe] Merge remote-tracking branch 'ia64/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/ia64/include/asm/Kbuild | 15 -
+ arch/ia64/include/asm/gcc_intrin.h | 615 +------------------
+ arch/ia64/include/asm/intrinsics.h | 120 +---
+ arch/ia64/include/asm/kvm_para.h | 10 +-
+ arch/ia64/include/asm/mman.h | 12 +-
+ arch/ia64/include/asm/param.h | 22 +-
+ arch/ia64/include/asm/perfmon.h | 171 +-----
+ arch/ia64/include/asm/ptrace.h | 236 +-------
+ arch/ia64/include/asm/siginfo.h | 118 +---
+ arch/ia64/include/asm/signal.h | 122 +---
+ arch/ia64/include/asm/termios.h | 46 +-
+ arch/ia64/include/asm/types.h | 19 +-
+ arch/ia64/include/asm/unistd.h | 324 +---------
+ arch/ia64/include/asm/ustack.h | 11 +-
+ arch/ia64/include/uapi/asm/Kbuild | 45 ++
+ arch/ia64/include/{ => uapi}/asm/auxvec.h | 0
+ arch/ia64/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/ia64/include/{ => uapi}/asm/break.h | 0
+ arch/ia64/include/{ => uapi}/asm/byteorder.h | 0
+ arch/ia64/include/{ => uapi}/asm/cmpxchg.h | 0
+ arch/ia64/include/{ => uapi}/asm/errno.h | 0
+ arch/ia64/include/{ => uapi}/asm/fcntl.h | 0
+ arch/ia64/include/{ => uapi}/asm/fpu.h | 0
+ arch/ia64/include/uapi/asm/gcc_intrin.h | 618 ++++++++++++++++++++
+ arch/ia64/include/{ => uapi}/asm/ia64regs.h | 0
+ arch/ia64/include/{ => uapi}/asm/intel_intrin.h | 0
+ arch/ia64/include/uapi/asm/intrinsics.h | 124 ++++
+ arch/ia64/include/{ => uapi}/asm/ioctl.h | 0
+ arch/ia64/include/{ => uapi}/asm/ioctls.h | 0
+ arch/ia64/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/ia64/include/{ => uapi}/asm/kvm.h | 0
+ arch/ia64/include/uapi/asm/mman.h | 16 +
+ arch/ia64/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/ia64/include/uapi/asm/param.h | 29 +
+ arch/ia64/include/uapi/asm/perfmon.h | 177 ++++++
+ .../include/{ => uapi}/asm/perfmon_default_smpl.h | 0
+ arch/ia64/include/{ => uapi}/asm/poll.h | 0
+ arch/ia64/include/{ => uapi}/asm/posix_types.h | 0
+ arch/ia64/include/uapi/asm/ptrace.h | 247 ++++++++
+ arch/ia64/include/{ => uapi}/asm/ptrace_offsets.h | 0
+ arch/ia64/include/{ => uapi}/asm/resource.h | 0
+ arch/ia64/include/{ => uapi}/asm/rse.h | 0
+ arch/ia64/include/{ => uapi}/asm/sembuf.h | 0
+ arch/ia64/include/{ => uapi}/asm/setup.h | 0
+ arch/ia64/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/ia64/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/ia64/include/uapi/asm/siginfo.h | 121 ++++
+ arch/ia64/include/uapi/asm/signal.h | 127 ++++
+ arch/ia64/include/{ => uapi}/asm/socket.h | 0
+ arch/ia64/include/{ => uapi}/asm/sockios.h | 0
+ arch/ia64/include/{ => uapi}/asm/stat.h | 0
+ arch/ia64/include/{ => uapi}/asm/statfs.h | 0
+ arch/ia64/include/{ => uapi}/asm/swab.h | 0
+ arch/ia64/include/{ => uapi}/asm/termbits.h | 0
+ arch/ia64/include/uapi/asm/termios.h | 50 ++
+ arch/ia64/include/uapi/asm/types.h | 31 +
+ arch/ia64/include/{ => uapi}/asm/ucontext.h | 0
+ arch/ia64/include/uapi/asm/unistd.h | 328 +++++++++++
+ arch/ia64/include/uapi/asm/ustack.h | 12 +
+ 59 files changed, 1961 insertions(+), 1805 deletions(-)
+ rename arch/ia64/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/break.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/cmpxchg.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/fpu.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/gcc_intrin.h
+ rename arch/ia64/include/{ => uapi}/asm/ia64regs.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/intel_intrin.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/intrinsics.h
+ rename arch/ia64/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/kvm.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/kvm_para.h
+ create mode 100644 arch/ia64/include/uapi/asm/mman.h
+ rename arch/ia64/include/{ => uapi}/asm/msgbuf.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/param.h
+ create mode 100644 arch/ia64/include/uapi/asm/perfmon.h
+ rename arch/ia64/include/{ => uapi}/asm/perfmon_default_smpl.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/ptrace.h
+ rename arch/ia64/include/{ => uapi}/asm/ptrace_offsets.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/rse.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/sembuf.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/sigcontext.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/siginfo.h
+ create mode 100644 arch/ia64/include/uapi/asm/signal.h
+ rename arch/ia64/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/termios.h
+ create mode 100644 arch/ia64/include/uapi/asm/types.h
+ rename arch/ia64/include/{ => uapi}/asm/ucontext.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/unistd.h
+ create mode 100644 arch/ia64/include/uapi/asm/ustack.h
+Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (a255172 m68knommu: fix inconsistent formating in ColdFire 5407 definitions)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging microblaze/next (94fda49 Revert "microblaze_mmu_v2: Update signal returning address")
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (382fc33 Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Resolved 'arch/mips/include/asm/octeon/octeon-model.h' using previous resolution.
+Resolved 'drivers/net/ethernet/octeon/octeon_mgmt.c' using previous resolution.
+Resolved 'drivers/pinctrl/Makefile' using previous resolution.
+Auto-merging drivers/spi/Makefile
+Auto-merging drivers/spi/Kconfig
+Auto-merging drivers/pinctrl/Makefile
+CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile
+Auto-merging drivers/pinctrl/Kconfig
+Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/octeon/octeon_mgmt.c
+Removing arch/mips/netlogic/xlp/platform.c
+Removing arch/mips/netlogic/xlp/of.c
+Removing arch/mips/mipssim/sim_time.c
+Removing arch/mips/mipssim/sim_smtc.c
+Removing arch/mips/mipssim/sim_setup.c
+Removing arch/mips/mipssim/sim_platform.c
+Removing arch/mips/mipssim/sim_mem.c
+Removing arch/mips/mipssim/sim_int.c
+Removing arch/mips/mipssim/sim_console.c
+Removing arch/mips/mipssim/Platform
+Removing arch/mips/mipssim/Makefile
+Removing arch/mips/lantiq/xway/gpio.c
+Auto-merging arch/mips/kernel/Makefile
+Auto-merging arch/mips/include/asm/octeon/octeon.h
+Auto-merging arch/mips/include/asm/octeon/octeon-model.h
+CONFLICT (content): Merge conflict in arch/mips/include/asm/octeon/octeon-model.h
+Removing arch/mips/include/asm/mips-boards/simint.h
+Auto-merging arch/mips/include/asm/mach-sead3/war.h
+Auto-merging arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h
+Auto-merging arch/mips/configs/nlm_xlp_defconfig
+Removing arch/mips/configs/mipssim_defconfig
+Auto-merging arch/mips/bcm63xx/boards/board_bcm963xx.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 29c011b] Merge remote-tracking branch 'mips/mips-for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/pinctrl/lantiq,falcon-pinumx.txt | 83 +
+ .../bindings/pinctrl/lantiq,xway-pinumx.txt | 97 +
+ .../devicetree/bindings/spi/spi-octeon.txt | 33 +
+ arch/mips/Kbuild.platforms | 2 +-
+ arch/mips/Kconfig | 46 +-
+ arch/mips/ath79/clock.c | 109 +-
+ arch/mips/ath79/dev-usb.c | 92 +-
+ arch/mips/ath79/mach-db120.c | 2 +
+ arch/mips/bcm63xx/Makefile | 2 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 +-
+ arch/mips/bcm63xx/clk.c | 21 +-
+ arch/mips/bcm63xx/dev-usb-usbd.c | 65 +
+ arch/mips/bcm63xx/irq.c | 22 +-
+ arch/mips/bcm63xx/setup.c | 6 +
+ arch/mips/cavium-octeon/csrc-octeon.c | 93 +-
+ .../cavium-octeon/executive/cvmx-interrupt-rsl.c | 2 +-
+ arch/mips/cavium-octeon/octeon-irq.c | 842 +-
+ arch/mips/cavium-octeon/setup.c | 3 +-
+ ...um-octeon_defconfig => cavium_octeon_defconfig} | 0
+ arch/mips/configs/mipssim_defconfig | 64 -
+ arch/mips/configs/nlm_xlp_defconfig | 133 +-
+ ...5-stb225_defconfig => pnx8335_stb225_defconfig} | 0
+ ...pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} | 0
+ ...0-stb810_defconfig => pnx8550_stb810_defconfig} | 0
+ ...1250-swarm_defconfig => sb1250_swarm_defconfig} | 0
+ arch/mips/configs/sead3_defconfig | 124 +
+ arch/mips/include/asm/cpu-features.h | 4 +-
+ arch/mips/include/asm/cpu.h | 2 +
+ arch/mips/include/asm/gic.h | 49 +-
+ arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 30 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 93 +-
+ .../asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h | 17 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h | 38 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 168 +-
+ .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 5 +
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 2 +-
+ arch/mips/include/asm/mach-cavium-octeon/irq.h | 7 +-
+ .../include/asm/mach-lantiq/falcon/falcon_irq.h | 2 +
+ .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 4 +
+ arch/mips/include/asm/mach-lantiq/gpio.h | 5 +-
+ .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 2 +
+ .../cpu-feature-overrides.h | 15 +-
+ arch/mips/include/asm/mach-sead3/irq.h | 9 +
+ .../include/asm/mach-sead3/kernel-entry-init.h | 52 +
+ .../include/asm/{mach-mipssim => mach-sead3}/war.h | 12 +-
+ arch/mips/include/asm/mips-boards/maltaint.h | 55 +-
+ arch/mips/include/asm/mips-boards/sead3int.h | 19 +
+ arch/mips/include/asm/mips-boards/simint.h | 31 -
+ arch/mips/include/asm/mipsregs.h | 3 +
+ arch/mips/include/asm/octeon/cvmx-agl-defs.h | 1014 +-
+ arch/mips/include/asm/octeon/cvmx-asxx-defs.h | 300 +-
+ arch/mips/include/asm/octeon/cvmx-ciu-defs.h |11333 ++++++++++++++++----
+ arch/mips/include/asm/octeon/cvmx-ciu2-defs.h | 7108 ++++++++++++
+ arch/mips/include/asm/octeon/cvmx-dbg-defs.h | 39 +-
+ arch/mips/include/asm/octeon/cvmx-dpi-defs.h | 411 +-
+ arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1321 ++-
+ arch/mips/include/asm/octeon/cvmx-gmxx-defs.h | 4966 ++++++++-
+ arch/mips/include/asm/octeon/cvmx-gpio-defs.h | 282 +-
+ arch/mips/include/asm/octeon/cvmx-iob-defs.h | 722 +-
+ arch/mips/include/asm/octeon/cvmx-ipd-defs.h | 1111 +-
+ arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 1726 ++-
+ arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 171 +-
+ arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 105 +-
+ arch/mips/include/asm/octeon/cvmx-led-defs.h | 67 +-
+ arch/mips/include/asm/octeon/cvmx-mio-defs.h | 1909 +++-
+ arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 234 +-
+ arch/mips/include/asm/octeon/cvmx-mpi-defs.h | 328 +
+ arch/mips/include/asm/octeon/cvmx-npei-defs.h | 1743 ++-
+ arch/mips/include/asm/octeon/cvmx-npi-defs.h | 1260 ++-
+ arch/mips/include/asm/octeon/cvmx-pci-defs.h | 909 +-
+ arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 1292 ++-
+ arch/mips/include/asm/octeon/cvmx-pcsx-defs.h | 729 +-
+ arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h | 574 +-
+ arch/mips/include/asm/octeon/cvmx-pemx-defs.h | 288 +-
+ arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 246 +-
+ arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-pip-defs.h | 2431 ++++-
+ arch/mips/include/asm/octeon/cvmx-pko-defs.h | 1993 +++-
+ arch/mips/include/asm/octeon/cvmx-pow-defs.h | 530 +-
+ arch/mips/include/asm/octeon/cvmx-rnm-defs.h | 107 +-
+ arch/mips/include/asm/octeon/cvmx-sli-defs.h | 1351 ++-
+ arch/mips/include/asm/octeon/cvmx-smix-defs.h | 202 +-
+ arch/mips/include/asm/octeon/cvmx-spxx-defs.h | 225 +-
+ arch/mips/include/asm/octeon/cvmx-sriox-defs.h | 703 +-
+ arch/mips/include/asm/octeon/cvmx-srxx-defs.h | 62 +-
+ arch/mips/include/asm/octeon/cvmx-stxx-defs.h | 166 +-
+ arch/mips/include/asm/octeon/cvmx-uctlx-defs.h | 268 +-
+ arch/mips/include/asm/octeon/octeon-model.h | 18 +
+ arch/mips/include/asm/octeon/octeon.h | 4 +
+ arch/mips/include/asm/pgtable-bits.h | 18 +-
+ arch/mips/include/asm/pgtable.h | 12 +-
+ arch/mips/include/asm/thread_info.h | 6 +-
+ arch/mips/include/asm/uasm.h | 2 +
+ arch/mips/include/asm/unistd.h | 15 +-
+ arch/mips/kernel/Makefile | 19 +-
+ arch/mips/kernel/cevt-r4k.c | 5 +
+ arch/mips/kernel/cpu-probe.c | 10 +-
+ arch/mips/kernel/entry.S | 15 +-
+ arch/mips/kernel/irq-gic.c | 162 +-
+ arch/mips/kernel/scall32-o32.S | 14 +-
+ arch/mips/kernel/scall64-64.S | 14 +-
+ arch/mips/kernel/scall64-n32.S | 14 +-
+ arch/mips/kernel/scall64-o32.S | 14 +-
+ arch/mips/kernel/signal.c | 8 -
+ arch/mips/kernel/smp-mt.c | 2 +
+ arch/mips/lantiq/Kconfig | 2 +
+ arch/mips/lantiq/falcon/prom.c | 5 +
+ arch/mips/lantiq/falcon/sysctrl.c | 1 +
+ arch/mips/lantiq/irq.c | 82 +-
+ arch/mips/lantiq/xway/Makefile | 2 +-
+ arch/mips/lantiq/xway/gpio.c | 183 -
+ arch/mips/lantiq/xway/gptu.c | 214 +
+ arch/mips/lantiq/xway/sysctrl.c | 5 +-
+ arch/mips/lib/Makefile | 21 +-
+ arch/mips/mipssim/Makefile | 23 -
+ arch/mips/mipssim/Platform | 6 -
+ arch/mips/mipssim/sim_console.c | 40 -
+ arch/mips/mipssim/sim_int.c | 87 -
+ arch/mips/mipssim/sim_mem.c | 115 -
+ arch/mips/mipssim/sim_platform.c | 35 -
+ arch/mips/mipssim/sim_setup.c | 99 -
+ arch/mips/mipssim/sim_smtc.c | 116 -
+ arch/mips/mipssim/sim_time.c | 117 -
+ arch/mips/mm/Makefile | 17 +-
+ arch/mips/mm/c-r4k.c | 21 +
+ arch/mips/mm/cache.c | 2 +-
+ arch/mips/mm/fault.c | 2 +-
+ arch/mips/mm/tlb-r4k.c | 2 +-
+ arch/mips/mm/tlbex.c | 44 +-
+ arch/mips/mm/uasm.c | 23 +-
+ arch/mips/mti-malta/malta-int.c | 34 +
+ arch/mips/mti-sead3/Makefile | 19 +
+ arch/mips/mti-sead3/Platform | 7 +
+ arch/mips/mti-sead3/leds-sead3.c | 128 +
+ arch/mips/mti-sead3/sead3-cmdline.c | 46 +
+ arch/mips/mti-sead3/sead3-console.c | 46 +
+ arch/mips/mti-sead3/sead3-display.c | 78 +
+ arch/mips/mti-sead3/sead3-ehci.c | 47 +
+ arch/mips/mti-sead3/sead3-i2c-dev.c | 33 +
+ arch/mips/mti-sead3/sead3-i2c-drv.c | 405 +
+ arch/mips/mti-sead3/sead3-i2c.c | 37 +
+ arch/mips/mti-sead3/sead3-init.c | 91 +
+ arch/mips/mti-sead3/sead3-int.c | 158 +
+ arch/mips/mti-sead3/sead3-lcd.c | 43 +
+ arch/mips/mti-sead3/sead3-leds.c | 83 +
+ arch/mips/mti-sead3/sead3-memory.c | 138 +
+ arch/mips/mti-sead3/sead3-mtd.c | 54 +
+ arch/mips/mti-sead3/sead3-net.c | 51 +
+ arch/mips/mti-sead3/sead3-pic32-bus.c | 103 +
+ arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 435 +
+ arch/mips/mti-sead3/sead3-platform.c | 45 +
+ arch/mips/mti-sead3/sead3-reset.c | 39 +
+ arch/mips/mti-sead3/sead3-serial.c | 45 +
+ arch/mips/mti-sead3/sead3-setup.c | 20 +
+ arch/mips/mti-sead3/sead3-time.c | 117 +
+ arch/mips/netlogic/Kconfig | 15 +
+ arch/mips/netlogic/Makefile | 1 +
+ arch/mips/netlogic/dts/Makefile | 4 +
+ arch/mips/netlogic/dts/xlp_evp.dts | 124 +
+ arch/mips/netlogic/xlp/Makefile | 3 +-
+ arch/mips/netlogic/xlp/of.c | 34 -
+ arch/mips/netlogic/xlp/platform.c | 108 -
+ arch/mips/netlogic/xlp/setup.c | 32 +-
+ drivers/gpio/gpio-stp-xway.c | 2 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h | 30 +-
+ drivers/net/ethernet/octeon/octeon_mgmt.c | 550 +-
+ drivers/pinctrl/Kconfig | 16 +
+ drivers/pinctrl/Makefile | 3 +
+ drivers/pinctrl/pinctrl-falcon.c | 468 +
+ drivers/pinctrl/pinctrl-lantiq.c | 342 +
+ drivers/pinctrl/pinctrl-lantiq.h | 194 +
+ drivers/pinctrl/pinctrl-xway.c | 781 ++
+ drivers/spi/Kconfig | 7 +
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-octeon.c | 362 +
+ 175 files changed, 52822 insertions(+), 4892 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-octeon.txt
+ create mode 100644 arch/mips/bcm63xx/dev-usb-usbd.c
+ rename arch/mips/configs/{cavium-octeon_defconfig => cavium_octeon_defconfig} (100%)
+ delete mode 100644 arch/mips/configs/mipssim_defconfig
+ rename arch/mips/configs/{pnx8335-stb225_defconfig => pnx8335_stb225_defconfig} (100%)
+ rename arch/mips/configs/{pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} (100%)
+ rename arch/mips/configs/{pnx8550-stb810_defconfig => pnx8550_stb810_defconfig} (100%)
+ rename arch/mips/configs/{sb1250-swarm_defconfig => sb1250_swarm_defconfig} (100%)
+ create mode 100644 arch/mips/configs/sead3_defconfig
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
+ rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/cpu-feature-overrides.h (83%)
+ create mode 100644 arch/mips/include/asm/mach-sead3/irq.h
+ create mode 100644 arch/mips/include/asm/mach-sead3/kernel-entry-init.h
+ rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/war.h (72%)
+ create mode 100644 arch/mips/include/asm/mips-boards/sead3int.h
+ delete mode 100644 arch/mips/include/asm/mips-boards/simint.h
+ create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu2-defs.h
+ create mode 100644 arch/mips/include/asm/octeon/cvmx-mpi-defs.h
+ delete mode 100644 arch/mips/lantiq/xway/gpio.c
+ create mode 100644 arch/mips/lantiq/xway/gptu.c
+ delete mode 100644 arch/mips/mipssim/Makefile
+ delete mode 100644 arch/mips/mipssim/Platform
+ delete mode 100644 arch/mips/mipssim/sim_console.c
+ delete mode 100644 arch/mips/mipssim/sim_int.c
+ delete mode 100644 arch/mips/mipssim/sim_mem.c
+ delete mode 100644 arch/mips/mipssim/sim_platform.c
+ delete mode 100644 arch/mips/mipssim/sim_setup.c
+ delete mode 100644 arch/mips/mipssim/sim_smtc.c
+ delete mode 100644 arch/mips/mipssim/sim_time.c
+ create mode 100644 arch/mips/mti-sead3/Makefile
+ create mode 100644 arch/mips/mti-sead3/Platform
+ create mode 100644 arch/mips/mti-sead3/leds-sead3.c
+ create mode 100644 arch/mips/mti-sead3/sead3-cmdline.c
+ create mode 100644 arch/mips/mti-sead3/sead3-console.c
+ create mode 100644 arch/mips/mti-sead3/sead3-display.c
+ create mode 100644 arch/mips/mti-sead3/sead3-ehci.c
+ create mode 100644 arch/mips/mti-sead3/sead3-i2c-dev.c
+ create mode 100644 arch/mips/mti-sead3/sead3-i2c-drv.c
+ create mode 100644 arch/mips/mti-sead3/sead3-i2c.c
+ create mode 100644 arch/mips/mti-sead3/sead3-init.c
+ create mode 100644 arch/mips/mti-sead3/sead3-int.c
+ create mode 100644 arch/mips/mti-sead3/sead3-lcd.c
+ create mode 100644 arch/mips/mti-sead3/sead3-leds.c
+ create mode 100644 arch/mips/mti-sead3/sead3-memory.c
+ create mode 100644 arch/mips/mti-sead3/sead3-mtd.c
+ create mode 100644 arch/mips/mti-sead3/sead3-net.c
+ create mode 100644 arch/mips/mti-sead3/sead3-pic32-bus.c
+ create mode 100644 arch/mips/mti-sead3/sead3-pic32-i2c-drv.c
+ create mode 100644 arch/mips/mti-sead3/sead3-platform.c
+ create mode 100644 arch/mips/mti-sead3/sead3-reset.c
+ create mode 100644 arch/mips/mti-sead3/sead3-serial.c
+ create mode 100644 arch/mips/mti-sead3/sead3-setup.c
+ create mode 100644 arch/mips/mti-sead3/sead3-time.c
+ create mode 100644 arch/mips/netlogic/dts/Makefile
+ create mode 100644 arch/mips/netlogic/dts/xlp_evp.dts
+ delete mode 100644 arch/mips/netlogic/xlp/of.c
+ delete mode 100644 arch/mips/netlogic/xlp/platform.c
+ create mode 100644 drivers/pinctrl/pinctrl-falcon.c
+ create mode 100644 drivers/pinctrl/pinctrl-lantiq.c
+ create mode 100644 drivers/pinctrl/pinctrl-lantiq.h
+ create mode 100644 drivers/pinctrl/pinctrl-xway.c
+ create mode 100644 drivers/spi/spi-octeon.c
+Merging openrisc/for-upstream (4c8faa4 openrisc: mask interrupts in irq_mask_ack function)
+$ git merge openrisc/for-upstream
+Auto-merging include/linux/audit.h
+Merge made by the 'recursive' strategy.
+ arch/openrisc/include/asm/processor.h | 2 +-
+ arch/openrisc/kernel/irq.c | 20 +++++++++++---------
+ arch/openrisc/kernel/ptrace.c | 2 +-
+ arch/openrisc/lib/delay.c | 6 +++---
+ include/linux/audit.h | 1 +
+ 5 files changed, 17 insertions(+), 14 deletions(-)
+Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging s390/features (1741af3 s390/css_chars: remove superfluous ifdef)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig.debug | 12 ++
+ arch/s390/include/asm/chpid.h | 10 +-
+ arch/s390/include/asm/chsc.h | 10 +-
+ arch/s390/include/asm/css_chars.h | 3 -
+ arch/s390/include/asm/page.h | 14 ++-
+ arch/s390/include/asm/pgtable.h | 9 ++
+ arch/s390/include/asm/setup.h | 14 ++-
+ arch/s390/kernel/early.c | 17 +--
+ arch/s390/kernel/head.S | 101 +++++++++++------
+ arch/s390/kernel/head31.S | 3 -
+ arch/s390/kernel/head64.S | 3 -
+ arch/s390/kernel/setup.c | 38 ++++++-
+ arch/s390/mm/Makefile | 1 +
+ arch/s390/mm/dump_pagetables.c | 219 +++++++++++++++++++++++++++++++++++++
+ arch/s390/mm/pageattr.c | 40 ++++---
+ arch/s390/mm/vmem.c | 33 +++---
+ drivers/s390/block/dcssblk.c | 52 ++++-----
+ 17 files changed, 447 insertions(+), 132 deletions(-)
+ create mode 100644 arch/s390/mm/dump_pagetables.c
+Merging sh/sh-latest (16d74eb sh: pfc: Fix up GPIO mux type reconfig case.)
+$ git merge sh/sh-latest
+Already up-to-date.
+Merging sparc-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (e70cf54 tile: gxio iorpc numbering change for TRIO interface)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
+$ git merge unicore32/unicore32
+Auto-merging arch/unicore32/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig | 3 +++
+ arch/unicore32/include/asm/bug.h | 5 -----
+ arch/unicore32/include/asm/cmpxchg.h | 2 +-
+ arch/unicore32/kernel/setup.h | 6 ++++++
+ arch/unicore32/mm/fault.c | 37 +++++++++++++++++++++++++---------
+ 5 files changed, 37 insertions(+), 16 deletions(-)
+Merging xtensa/for_next (ded389d xtensa: Add missing RCU idle APIs on idle loop)
+$ git merge xtensa/for_next
+Removing arch/xtensa/platforms/iss/io.c
+Auto-merging arch/xtensa/platforms/iss/console.c
+Auto-merging arch/xtensa/kernel/pci.c
+Removing arch/xtensa/kernel/io.c
+Auto-merging arch/xtensa/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 6 +-
+ arch/xtensa/Makefile | 2 +-
+ arch/xtensa/boot/boot-elf/Makefile | 9 +-
+ arch/xtensa/boot/boot-redboot/Makefile | 12 +-
+ arch/xtensa/include/asm/io.h | 172 +++-----------------
+ arch/xtensa/include/asm/ioctls.h | 4 +-
+ arch/xtensa/include/asm/regs.h | 2 +-
+ arch/xtensa/kernel/Makefile | 3 +-
+ arch/xtensa/kernel/io.c | 75 ---------
+ arch/xtensa/kernel/irq.c | 4 +-
+ arch/xtensa/kernel/pci-dma.c | 4 +
+ arch/xtensa/kernel/pci.c | 2 +-
+ arch/xtensa/kernel/platform.c | 4 +-
+ arch/xtensa/kernel/xtensa_ksyms.c | 25 +++
+ arch/xtensa/platforms/iss/Makefile | 4 +-
+ arch/xtensa/platforms/iss/console.c | 15 +-
+ .../platforms/iss/include/platform/simcall.h | 53 ++++++
+ arch/xtensa/platforms/iss/io.c | 32 ----
+ arch/xtensa/platforms/iss/network.c | 49 ------
+ arch/xtensa/platforms/iss/setup.c | 14 +-
+ drivers/isdn/hisax/Kconfig | 10 +-
+ drivers/parport/Kconfig | 2 +-
+ drivers/usb/musb/musb_io.h | 3 +-
+ scripts/mod/modpost.c | 2 +
+ 24 files changed, 154 insertions(+), 354 deletions(-)
+ delete mode 100644 arch/xtensa/kernel/io.c
+ create mode 100644 arch/xtensa/platforms/iss/include/platform/serial.h
+ delete mode 100644 arch/xtensa/platforms/iss/io.c
+Merging btrfs/next (0b2d449 btrfs: move inline function code to header file)
+$ git merge btrfs/next
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/delayed-inode.c
+Auto-merging fs/btrfs/ctree.h
+Merge made by the 'recursive' strategy.
+ fs/btrfs/backref.c | 299 ++++++++++---
+ fs/btrfs/backref.h | 10 +-
+ fs/btrfs/btrfs_inode.h | 15 +-
+ fs/btrfs/ctree.c | 148 +------
+ fs/btrfs/ctree.h | 104 ++++-
+ fs/btrfs/delayed-inode.c | 6 +-
+ fs/btrfs/disk-io.c | 117 ++---
+ fs/btrfs/extent-tree.c | 376 ++++++++--------
+ fs/btrfs/extent_io.c | 111 +++--
+ fs/btrfs/extent_io.h | 23 +-
+ fs/btrfs/extent_map.c | 55 ++-
+ fs/btrfs/extent_map.h | 8 +-
+ fs/btrfs/file-item.c | 5 +-
+ fs/btrfs/file.c | 447 +++++++++++++++++--
+ fs/btrfs/free-space-cache.c | 10 +-
+ fs/btrfs/hash.h | 10 +
+ fs/btrfs/inode-item.c | 285 +++++++++++-
+ fs/btrfs/inode.c | 1002 +++++++++++++++++++++++++++++++++++++-----
+ fs/btrfs/ioctl.c | 92 ++--
+ fs/btrfs/ordered-data.c | 97 ++--
+ fs/btrfs/ordered-data.h | 12 +-
+ fs/btrfs/qgroup.c | 40 +-
+ fs/btrfs/relocation.c | 11 +-
+ fs/btrfs/root-tree.c | 29 +-
+ fs/btrfs/scrub.c | 30 +-
+ fs/btrfs/send.c | 915 +++++++++++++++++++++-----------------
+ fs/btrfs/send.h | 1 +
+ fs/btrfs/super.c | 52 ++-
+ fs/btrfs/transaction.c | 283 ++++++++----
+ fs/btrfs/transaction.h | 20 +-
+ fs/btrfs/tree-log.c | 798 +++++++++++++++++++++++++++------
+ fs/btrfs/ulist.c | 7 +-
+ fs/btrfs/ulist.h | 9 +-
+ fs/btrfs/volumes.c | 37 +-
+ include/trace/events/btrfs.h | 14 +-
+ 35 files changed, 3926 insertions(+), 1552 deletions(-)
+Merging ceph/master (6285bc2 ceph: avoid 32-bit page index overflow)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (612a9aa Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
+$ git merge cifs/for-next
+Already up-to-date.
+Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (09e05d4 jbd: Fix assertion failure in commit code due to lacking transaction credits)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (c278531 ext4: fix ext4_flush_completed_IO wait semantics)
+$ git merge ext4/dev
+Already up-to-date.
+Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
+$ git merge fuse/for-next
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/dev.c
+Merge made by the 'recursive' strategy.
+ fs/Kconfig | 10 ----
+ fs/fuse/Kconfig | 16 ++++-
+ fs/fuse/dev.c | 19 ++++++
+ fs/fuse/dir.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/fuse/fuse_i.h | 6 ++
+ fs/fuse/inode.c | 5 +-
+ include/linux/fuse.h | 12 ++++
+ 7 files changed, 211 insertions(+), 17 deletions(-)
+Merging gfs2/master (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge gfs2/master
+Already up-to-date.
+Merging jfs/jfs-next (84f4141 jfs: Fix do_div precision in commit b40c2e66)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
+$ git merge logfs/master
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nfs/linux-next (22aaf71 NFSv4.1: Ensure that the layout sequence id stays 'close' to the current)
+$ git merge nfs/linux-next
+Auto-merging fs/nfs/super.c
+Auto-merging fs/nfs/inode.c
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/nfs/nfs.txt | 44 +++-
+ Documentation/kernel-parameters.txt | 5 +
+ fs/lockd/mon.c | 86 ++++++--
+ fs/lockd/netns.h | 4 +
+ fs/lockd/svc.c | 1 +
+ fs/nfs/Kconfig | 4 +-
+ fs/nfs/blocklayout/blocklayout.c | 270 +++++++++++++++++++----
+ fs/nfs/blocklayout/blocklayout.h | 1 +
+ fs/nfs/blocklayout/extents.c | 3 +-
+ fs/nfs/callback.c | 321 +++++++++++++++++----------
+ fs/nfs/callback.h | 3 +-
+ fs/nfs/callback_proc.c | 31 ++-
+ fs/nfs/client.c | 23 +-
+ fs/nfs/dir.c | 16 +-
+ fs/nfs/direct.c | 20 +-
+ fs/nfs/file.c | 41 +++-
+ fs/nfs/getroot.c | 2 +
+ fs/nfs/idmap.c | 114 ++++++----
+ fs/nfs/inode.c | 10 +-
+ fs/nfs/internal.h | 14 +-
+ fs/nfs/netns.h | 4 +
+ fs/nfs/nfs4_fs.h | 19 +-
+ fs/nfs/nfs4client.c | 256 +++++++++++++++++++++-
+ fs/nfs/nfs4file.c | 29 ++-
+ fs/nfs/nfs4filelayout.c | 41 ++--
+ fs/nfs/nfs4filelayout.h | 16 +-
+ fs/nfs/nfs4filelayoutdev.c | 17 +-
+ fs/nfs/nfs4namespace.c | 16 +-
+ fs/nfs/nfs4proc.c | 342 +++++++++++++++++++++--------
+ fs/nfs/nfs4state.c | 228 +++++++++++++++++--
+ fs/nfs/nfs4sysctl.c | 1 +
+ fs/nfs/nfs4xdr.c | 31 ++-
+ fs/nfs/pagelist.c | 12 +-
+ fs/nfs/pnfs.c | 388 +++++++++++++++++++--------------
+ fs/nfs/pnfs.h | 54 ++---
+ fs/nfs/pnfs_dev.c | 27 +++
+ fs/nfs/super.c | 31 ++-
+ fs/nfs/write.c | 11 +-
+ include/linux/nfs_fs.h | 11 +-
+ include/linux/nfs_fs_sb.h | 3 +
+ include/linux/nfs_xdr.h | 5 +-
+ include/linux/sunrpc/clnt.h | 2 +
+ include/linux/sunrpc/xprt.h | 3 +-
+ net/sunrpc/auth_gss/auth_gss.c | 58 ++---
+ net/sunrpc/clnt.c | 105 +++++----
+ net/sunrpc/rpc_pipe.c | 8 +-
+ net/sunrpc/sched.c | 2 +-
+ net/sunrpc/xdr.c | 21 +-
+ net/sunrpc/xprt.c | 8 +-
+ net/sunrpc/xprtrdma/transport.c | 22 +-
+ net/sunrpc/xprtsock.c | 40 ++--
+ 51 files changed, 2043 insertions(+), 781 deletions(-)
+Merging nfsd/nfsd-next (0d22f68 nfsd4: don't allow reclaims of expired clients)
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/nfs/callback.c
+Auto-merging fs/locks.c
+Auto-merging fs/lockd/svc.c
+Merge made by the 'recursive' strategy.
+ .../filesystems/nfs/nfsd-admin-interfaces.txt | 41 +++
+ fs/lockd/svc.c | 17 +-
+ fs/locks.c | 6 +-
+ fs/nfs/callback.c | 16 +-
+ fs/nfsd/nfs2acl.c | 3 +-
+ fs/nfsd/nfs3proc.c | 2 +-
+ fs/nfsd/nfs4callback.c | 1 -
+ fs/nfsd/nfs4idmap.c | 4 +-
+ fs/nfsd/nfs4proc.c | 6 +-
+ fs/nfsd/nfs4state.c | 351 +++++++++++---------
+ fs/nfsd/nfs4xdr.c | 2 +-
+ fs/nfsd/nfsctl.c | 84 +----
+ fs/nfsd/nfsd.h | 4 +-
+ fs/nfsd/nfssvc.c | 26 +-
+ fs/nfsd/state.h | 8 +-
+ fs/nfsd/vfs.c | 2 +-
+ include/linux/sunrpc/svc_xprt.h | 5 +-
+ include/linux/sunrpc/svcsock.h | 3 -
+ net/sunrpc/svc_xprt.c | 233 +++++++------
+ net/sunrpc/svcsock.c | 157 +++------
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 -
+ 21 files changed, 460 insertions(+), 515 deletions(-)
+ create mode 100644 Documentation/filesystems/nfs/nfsd-admin-interfaces.txt
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Merge made by the 'recursive' strategy.
+ fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
+ fs/ocfs2/cluster/masklog.h | 3 ++-
+ fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
+ fs/ocfs2/symlink.c | 2 +-
+ 5 files changed, 27 insertions(+), 35 deletions(-)
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
+$ git merge v9fs/for-next
+Auto-merging net/9p/trans_fd.c
+Auto-merging fs/9p/v9fs.c
+Merge made by the 'recursive' strategy.
+ fs/9p/v9fs.c | 30 +++++++++++++++++++-----------
+ fs/9p/vfs_inode.c | 8 ++++----
+ net/9p/client.c | 18 ++++++++++++++++--
+ net/9p/trans_fd.c | 38 ++++++++++++++++++++------------------
+ 4 files changed, 59 insertions(+), 35 deletions(-)
+Merging ubifs/linux-next (3668b70 UBIFS: print less)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (2ea0392 xfs: Make inode32 a remountable option)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging vfs/for-next (2bd2c19 MAX_LFS_FILESIZE should be a loff_t)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next)
+$ git merge pci/next
+Already up-to-date.
+Merging powerpc/next (d900bd7 powerpc/iommu: Fix multiple issues with IOMMU pools code)
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (f3ac712 powerpc/pcm030: add pcm030-audio-fabric to dts)
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/boot/dts/pcm030.dts | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
+$ git merge galak/next
+Already up-to-date.
+Merging hid/for-next (0b82411 Merge branch 'hidraw' into for-next)
+$ git merge hid/for-next
+Resolved 'drivers/hid/hid-multitouch.c' using previous resolution.
+Auto-merging drivers/hid/hid-multitouch.c
+CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fb35433] Merge remote-tracking branch 'hid/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging quilt/i2c (826fcbd i2c-piix4: Fix build failure)
+$ git merge quilt/i2c
+Merge made by the 'recursive' strategy.
+Merging i2c-embedded/i2c-embedded/for-next (d3b64c5 i2c: s3c2410: use clk_prepare_enable and clk_disable_unprepare)
+$ git merge i2c-embedded/i2c-embedded/for-next
+Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution.
+Auto-merging drivers/i2c/busses/i2c-s3c2410.c
+Auto-merging drivers/i2c/busses/i2c-omap.c
+CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
+Auto-merging drivers/i2c/busses/i2c-mpc.c
+Auto-merging drivers/i2c/busses/i2c-imx.c
+Auto-merging drivers/i2c/busses/i2c-davinci.c
+Auto-merging drivers/i2c/busses/Kconfig
+Auto-merging drivers/i2c/algos/i2c-algo-pca.c
+Auto-merging arch/arm/plat-omap/i2c.c
+Removing arch/arm/mach-at91/include/mach/at91_twi.h
+Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9263.c
+Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
+Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
+Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9263.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9260.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master dc11450] Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/i2c/atmel-i2c.txt | 30 +
+ Documentation/devicetree/bindings/i2c/davinci.txt | 28 +
+ Documentation/devicetree/bindings/i2c/nomadik.txt | 23 +
+ arch/arm/boot/dts/at91sam9260.dtsi | 10 +
+ arch/arm/boot/dts/at91sam9263.dtsi | 10 +
+ arch/arm/boot/dts/at91sam9g20.dtsi | 4 +
+ arch/arm/boot/dts/at91sam9g25ek.dts | 12 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 20 +
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 8 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 20 +
+ arch/arm/boot/dts/at91sam9n12ek.dts | 8 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 30 +
+ arch/arm/mach-at91/at91rm9200.c | 1 +
+ arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9260.c | 3 +
+ arch/arm/mach-at91/at91sam9260_devices.c | 8 +-
+ arch/arm/mach-at91/at91sam9261.c | 2 +
+ arch/arm/mach-at91/at91sam9261_devices.c | 14 +-
+ arch/arm/mach-at91/at91sam9263.c | 2 +
+ arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9g45.c | 4 +
+ arch/arm/mach-at91/at91sam9g45_devices.c | 10 +-
+ arch/arm/mach-at91/at91sam9n12.c | 2 +
+ arch/arm/mach-at91/at91sam9rl.c | 2 +
+ arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9x5.c | 3 +
+ arch/arm/mach-at91/include/mach/at91_twi.h | 68 --
+ arch/arm/plat-omap/i2c.c | 21 -
+ drivers/i2c/algos/i2c-algo-pca.c | 27 +-
+ drivers/i2c/busses/Kconfig | 17 +-
+ drivers/i2c/busses/i2c-at91.c | 667 +++++++++++++-------
+ drivers/i2c/busses/i2c-davinci.c | 58 +-
+ drivers/i2c/busses/i2c-imx.c | 6 +-
+ drivers/i2c/busses/i2c-mpc.c | 18 +-
+ drivers/i2c/busses/i2c-nomadik.c | 52 +-
+ drivers/i2c/busses/i2c-omap.c | 474 ++++++++------
+ drivers/i2c/busses/i2c-s3c2410.c | 18 +-
+ include/linux/i2c-algo-pca.h | 1 +
+ include/linux/i2c-omap.h | 1 -
+ include/linux/platform_data/i2c-nomadik.h | 2 +-
+ 40 files changed, 1115 insertions(+), 575 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/atmel-i2c.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/davinci.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/nomadik.txt
+ delete mode 100644 arch/arm/mach-at91/include/mach/at91_twi.h
+Merging quilt/jdelvare-hwmon (e086be6 hwmon: Drop needless includes of <linux/delay.h>)
+$ git merge quilt/jdelvare-hwmon
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/da9052 | 2 +-
+ Documentation/hwmon/max1619 | 2 +-
+ Documentation/hwmon/twl4030-madc-hwmon | 2 +-
+ drivers/hwmon/adm9240.c | 1 +
+ drivers/hwmon/adt7411.c | 1 -
+ drivers/hwmon/adt7462.c | 1 -
+ drivers/hwmon/adt7475.c | 1 +
+ drivers/hwmon/asus_atk0110.c | 1 +
+ drivers/hwmon/da9052-hwmon.c | 1 -
+ drivers/hwmon/emc1403.c | 1 +
+ drivers/hwmon/emc6w201.c | 1 -
+ drivers/hwmon/hih6130.c | 1 +
+ drivers/hwmon/i5k_amb.c | 2 --
+ drivers/hwmon/ina2xx.c | 1 +
+ drivers/hwmon/k8temp.c | 1 -
+ drivers/hwmon/lineage-pem.c | 1 +
+ drivers/hwmon/lm92.c | 1 +
+ drivers/hwmon/lm93.c | 1 +
+ drivers/hwmon/ltc4151.c | 1 +
+ drivers/hwmon/ltc4215.c | 1 +
+ drivers/hwmon/ltc4245.c | 1 +
+ drivers/hwmon/ltc4261.c | 1 +
+ drivers/hwmon/max16065.c | 1 -
+ drivers/hwmon/max1619.c | 4 ++--
+ drivers/hwmon/max6642.c | 2 +-
+ drivers/hwmon/pmbus/pmbus_core.c | 2 +-
+ drivers/hwmon/s3c-hwmon.c | 1 -
+ drivers/hwmon/sht21.c | 1 +
+ drivers/hwmon/smm665.c | 1 +
+ drivers/hwmon/thmc50.c | 1 +
+ drivers/hwmon/tmp102.c | 1 +
+ drivers/hwmon/w83791d.c | 1 +
+ drivers/hwmon/w83792d.c | 1 +
+ drivers/hwmon/w83793.c | 1 +
+ drivers/hwmon/w83795.c | 2 +-
+ drivers/hwmon/w83l786ng.c | 1 +
+ 36 files changed, 29 insertions(+), 17 deletions(-)
+Merging hwmon-staging/hwmon-next (967d7fe hwmon: (ads7828) driver cleanup)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/ads7828.c | 91 ++++++++++++++++++++++-------------------------
+ 1 file changed, 43 insertions(+), 48 deletions(-)
+Merging v4l-dvb/master (7da79d8 Merge /home/v4l/v4l/patchwork)
+$ git merge v4l-dvb/master
+Removing drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h
+Auto-merging drivers/media/platform/s5p-fimc/fimc-capture.c
+Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
+Auto-merging arch/arm/mach-exynos/mach-origen.c
+Auto-merging arch/arm/mach-exynos/mach-nuri.c
+Auto-merging arch/arm/mach-davinci/da850.c
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/media/v4l/compat.xml | 4 +
+ Documentation/DocBook/media/v4l/controls.xml | 278 ++-
+ Documentation/DocBook/media/v4l/io.xml | 6 +-
+ Documentation/DocBook/media/v4l/pixfmt-nv12m.xml | 17 +-
+ Documentation/DocBook/media/v4l/pixfmt.xml | 38 +
+ Documentation/DocBook/media/v4l/subdev-formats.xml | 44 +
+ Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 3 +-
+ .../DocBook/media/v4l/vidioc-querybuf.xml | 11 +-
+ Documentation/video4linux/v4l2-controls.txt | 24 +
+ arch/arm/mach-davinci/Kconfig | 7 +
+ arch/arm/mach-davinci/board-da850-evm.c | 179 ++
+ arch/arm/mach-davinci/board-dm644x-evm.c | 15 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 80 +-
+ arch/arm/mach-davinci/da850.c | 152 ++
+ arch/arm/mach-davinci/dm644x.c | 17 +-
+ arch/arm/mach-davinci/include/mach/da8xx.h | 11 +
+ arch/arm/mach-davinci/include/mach/mux.h | 42 +
+ arch/arm/mach-davinci/include/mach/psc.h | 1 +
+ arch/arm/mach-exynos/mach-nuri.c | 7 +-
+ arch/arm/mach-exynos/mach-origen.c | 4 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 7 +-
+ arch/arm/plat-samsung/setup-mipiphy.c | 20 +-
+ drivers/media/dvb-frontends/af9033.c | 16 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c | 3 +-
+ drivers/media/i2c/m5mols/m5mols.h | 9 +
+ drivers/media/i2c/m5mols/m5mols_capture.c | 3 +
+ drivers/media/i2c/m5mols/m5mols_core.c | 47 +
+ drivers/media/i2c/m5mols/m5mols_reg.h | 1 +
+ drivers/media/i2c/mt9p031.c | 19 +-
+ drivers/media/i2c/mt9t001.c | 22 +-
+ drivers/media/i2c/mt9v032.c | 54 +-
+ drivers/media/i2c/ths7303.c | 106 +-
+ drivers/media/i2c/tvp514x.c | 77 +-
+ drivers/media/platform/Kconfig | 4 +-
+ drivers/media/platform/davinci/vpbe.c | 110 +-
+ drivers/media/platform/davinci/vpbe_display.c | 80 +-
+ drivers/media/platform/davinci/vpbe_venc.c | 25 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 17 +-
+ drivers/media/platform/davinci/vpif_capture.c | 370 ++--
+ drivers/media/platform/davinci/vpif_capture.h | 16 +-
+ drivers/media/platform/davinci/vpif_display.c | 275 ++-
+ drivers/media/platform/davinci/vpif_display.h | 18 +-
+ drivers/media/platform/fsl-viu.c | 2 +-
+ drivers/media/platform/s5p-fimc/fimc-capture.c | 135 +-
+ drivers/media/platform/s5p-fimc/fimc-core.c | 19 +-
+ drivers/media/platform/s5p-fimc/fimc-core.h | 28 +-
+ drivers/media/platform/s5p-fimc/fimc-m2m.c | 25 +-
+ drivers/media/platform/s5p-fimc/fimc-reg.c | 23 +-
+ drivers/media/platform/s5p-fimc/fimc-reg.h | 3 +-
+ drivers/media/platform/s5p-fimc/mipi-csis.c | 75 +-
+ drivers/media/platform/s5p-g2d/g2d.c | 2 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 6 +-
+ drivers/media/platform/s5p-mfc/Makefile | 7 +-
+ drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 408 ++++
+ drivers/media/platform/s5p-mfc/regs-mfc.h | 41 +
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 294 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c | 111 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h | 17 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 166 ++
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h | 20 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 156 ++
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h | 20 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 191 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 202 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 258 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.h | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 236 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.h | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_intr.c | 11 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 1418 +-------------
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 137 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 1794 ++++++++++++++++++
+ .../s5p-mfc/{s5p_mfc_shm.h => s5p_mfc_opr_v5.h} | 41 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 1956 ++++++++++++++++++++
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 50 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 3 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_shm.c | 47 -
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 1 +
+ drivers/media/v4l2-core/v4l2-ctrls.c | 74 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
+ drivers/media/v4l2-core/videobuf2-core.c | 79 +-
+ include/linux/platform_data/mipi-csis.h | 30 +-
+ include/linux/v4l2-controls.h | 42 +
+ include/linux/v4l2-mediabus.h | 5 +
+ include/linux/videodev2.h | 5 +
+ include/media/davinci/vpbe.h | 14 +-
+ include/media/davinci/vpbe_types.h | 8 +-
+ include/media/davinci/vpbe_venc.h | 2 +-
+ include/media/davinci/vpif_types.h | 26 +-
+ include/media/s5p_fimc.h | 2 -
+ include/media/s5p_hdmi.h | 2 +
+ include/media/v4l2-ctrls.h | 23 +
+ include/media/v4l2-subdev.h | 48 +
+ 94 files changed, 7655 insertions(+), 2851 deletions(-)
+ create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v6.h
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+ rename drivers/media/platform/s5p-mfc/{s5p_mfc_shm.h => s5p_mfc_opr_v5.h} (76%)
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
+ delete mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
+Merging kbuild/for-next (f1748a9 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging tools/testing/ktest/ktest.pl
+Auto-merging scripts/kernel-doc
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 5 -
+ Makefile | 19 +--
+ scripts/Makefile.modinst | 2 +-
+ scripts/Makefile.modpost | 2 +-
+ scripts/coccinelle/api/ptr_ret.cocci | 26 ++++
+ scripts/kconfig/Makefile | 12 +-
+ scripts/kconfig/conf.c | 25 ++--
+ scripts/kconfig/expr.h | 11 ++
+ scripts/kconfig/lkc_proto.h | 6 +-
+ scripts/kconfig/lxdialog/dialog.h | 9 +-
+ scripts/kconfig/lxdialog/textbox.c | 171 +++++++++++----------
+ scripts/kconfig/lxdialog/util.c | 7 +
+ scripts/kconfig/mconf.c | 123 +++++++++++----
+ scripts/kconfig/menu.c | 53 +++++--
+ scripts/kconfig/nconf.c | 2 +-
+ scripts/kernel-doc | 273 +++++++++++++++++++++++++++++++++-
+ scripts/package/buildtar | 6 +-
+ scripts/tags.sh | 8 +-
+ tools/testing/ktest/ktest.pl | 15 +-
+ 19 files changed, 602 insertions(+), 173 deletions(-)
+Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
+$ git merge libata/NEXT
+Already up-to-date.
+Merging infiniband/for-next (56040f0 Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
+$ git merge pstore/master
+Already up-to-date.
+Merging acpi/next (558dc6f Merge branch 'upstream' into next)
+$ git merge acpi/next
+Recorded preimage for 'include/acpi/acpixf.h'
+Auto-merging include/acpi/acpixf.h
+CONFLICT (content): Merge conflict in include/acpi/acpixf.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'include/acpi/acpixf.h'.
+[master baf6cbc] Merge remote-tracking branch 'acpi/next'
+$ git diff -M --stat --summary HEAD^..
+Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
+$ git merge cpuidle/cpuidle-next
+Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
+Resolved 'include/linux/cpuidle.h' using previous resolution.
+Auto-merging include/linux/cpuidle.h
+CONFLICT (content): Merge conflict in include/linux/cpuidle.h
+Auto-merging drivers/cpuidle/coupled.c
+CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8f055c6] Merge remote-tracking branch 'cpuidle/cpuidle-next'
+$ git diff -M --stat --summary HEAD^..
+Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (4b69a04 thermal: user_space: Add missing static storage class specifiers)
+$ git merge thermal/next
+Resolved 'drivers/staging/omap-thermal/omap-thermal-common.c' using previous resolution.
+Resolved 'drivers/thermal/thermal_sys.c' using previous resolution.
+Auto-merging include/linux/platform_data/exynos_thermal.h
+Auto-merging drivers/thermal/thermal_sys.c
+CONFLICT (content): Merge conflict in drivers/thermal/thermal_sys.c
+Auto-merging drivers/staging/omap-thermal/omap-thermal-common.c
+CONFLICT (content): Merge conflict in drivers/staging/omap-thermal/omap-thermal-common.c
+Removing drivers/hwmon/exynos4_tmu.c
+Auto-merging drivers/hwmon/Makefile
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging drivers/acpi/thermal.c
+Auto-merging Documentation/thermal/exynos_thermal
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6eba5ff] Merge remote-tracking branch 'thermal/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/thermal/cpu-cooling-api.txt | 32 +
+ .../{hwmon/exynos4_tmu => thermal/exynos_thermal} | 35 +-
+ Documentation/thermal/sysfs-api.txt | 73 +-
+ drivers/acpi/thermal.c | 97 +-
+ drivers/hwmon/Kconfig | 10 -
+ drivers/hwmon/Makefile | 1 -
+ drivers/hwmon/exynos4_tmu.c | 518 ----------
+ drivers/platform/x86/acerhdf.c | 5 +-
+ drivers/platform/x86/intel_mid_thermal.c | 2 +-
+ drivers/power/power_supply_core.c | 2 +-
+ drivers/staging/omap-thermal/omap-thermal-common.c | 8 +-
+ drivers/thermal/Kconfig | 75 ++
+ drivers/thermal/Makefile | 8 +-
+ drivers/thermal/cpu_cooling.c | 449 +++++++++
+ drivers/thermal/exynos_thermal.c | 997 ++++++++++++++++++++
+ drivers/thermal/fair_share.c | 133 +++
+ drivers/thermal/rcar_thermal.c | 260 +++++
+ drivers/thermal/spear_thermal.c | 2 +-
+ drivers/thermal/step_wise.c | 194 ++++
+ drivers/thermal/thermal_core.h | 53 ++
+ drivers/thermal/thermal_sys.c | 761 ++++++++++-----
+ drivers/thermal/user_space.c | 68 ++
+ include/linux/cpu_cooling.h | 58 ++
+ .../{exynos4_tmu.h => exynos_thermal.h} | 47 +-
+ include/linux/thermal.h | 150 ++-
+ 25 files changed, 3161 insertions(+), 877 deletions(-)
+ create mode 100644 Documentation/thermal/cpu-cooling-api.txt
+ rename Documentation/{hwmon/exynos4_tmu => thermal/exynos_thermal} (71%)
+ delete mode 100644 drivers/hwmon/exynos4_tmu.c
+ create mode 100644 drivers/thermal/cpu_cooling.c
+ create mode 100644 drivers/thermal/exynos_thermal.c
+ create mode 100644 drivers/thermal/fair_share.c
+ create mode 100644 drivers/thermal/rcar_thermal.c
+ create mode 100644 drivers/thermal/step_wise.c
+ create mode 100644 drivers/thermal/thermal_core.h
+ create mode 100644 drivers/thermal/user_space.c
+ create mode 100644 include/linux/cpu_cooling.h
+ rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (64%)
+$ git am -3 ../patches/0001-termal-for-for-MAX_ID_MASK-to-MAX_IDR_MASK-rename.patch
+Applying: thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/thermal/cpu_cooling.c
+$ git add .
+$ git commit -v -a --amend
+[master 6fdee86] Merge remote-tracking branch 'thermal/next'
+Merging ieee1394/for-next (4d50c44 firewire: addendum to address handler RCU conversion)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (76ac66e UBI: Wire-up fastmap)
+$ git merge ubi/linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 +
+ drivers/mtd/ubi/Kconfig | 21 +
+ drivers/mtd/ubi/Makefile | 1 +
+ drivers/mtd/ubi/attach.c | 386 +++++++----
+ drivers/mtd/ubi/build.c | 70 +-
+ drivers/mtd/ubi/eba.c | 126 +++-
+ drivers/mtd/ubi/fastmap.c | 1537 +++++++++++++++++++++++++++++++++++++++++++
+ drivers/mtd/ubi/ubi-media.h | 137 ++++
+ drivers/mtd/ubi/ubi.h | 118 +++-
+ drivers/mtd/ubi/wl.c | 599 +++++++++++++++--
+ 10 files changed, 2790 insertions(+), 211 deletions(-)
+ create mode 100644 drivers/mtd/ubi/fastmap.c
+Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
+$ git merge dlm/next
+Already up-to-date.
+Merging scsi/for-next (3da4202 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values)
+$ git merge target-updates/for-next
+Auto-merging drivers/usb/gadget/tcm_usb_gadget.c
+Auto-merging drivers/target/iscsi/iscsi_target_parameters.c
+Auto-merging drivers/scsi/qla2xxx/qla_target.c
+Merge made by the 'recursive' strategy.
+ Documentation/target/tcm_mod_builder.py | 16 --
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 12 -
+ drivers/scsi/qla2xxx/qla_target.c | 2 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 15 --
+ drivers/target/iscsi/iscsi_target.c | 196 ++++++++--------
+ drivers/target/iscsi/iscsi_target.h | 5 +
+ drivers/target/iscsi/iscsi_target_configfs.c | 42 +---
+ drivers/target/iscsi/iscsi_target_core.h | 15 +-
+ drivers/target/iscsi/iscsi_target_erl0.c | 94 ++++----
+ drivers/target/iscsi/iscsi_target_erl1.c | 4 +-
+ drivers/target/iscsi/iscsi_target_erl1.h | 4 +-
+ drivers/target/iscsi/iscsi_target_erl2.c | 9 +-
+ drivers/target/iscsi/iscsi_target_erl2.h | 2 +-
+ drivers/target/iscsi/iscsi_target_login.c | 20 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 31 +--
+ drivers/target/iscsi/iscsi_target_parameters.c | 71 +++++-
+ drivers/target/iscsi/iscsi_target_parameters.h | 7 +-
+ drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 61 ++---
+ drivers/target/iscsi/iscsi_target_tmr.c | 31 +--
+ drivers/target/iscsi/iscsi_target_tpg.c | 12 +
+ drivers/target/iscsi/iscsi_target_tq.c | 6 +-
+ drivers/target/iscsi/iscsi_target_tq.h | 1 -
+ drivers/target/iscsi/iscsi_target_util.c | 16 +-
+ drivers/target/iscsi/iscsi_target_util.h | 8 +-
+ drivers/target/loopback/tcm_loop.c | 74 +-----
+ drivers/target/sbp/sbp_target.c | 27 +--
+ drivers/target/target_core_alua.c | 2 +-
+ drivers/target/target_core_configfs.c | 18 +-
+ drivers/target/target_core_device.c | 16 +-
+ drivers/target/target_core_fabric_configfs.c | 1 -
+ drivers/target/target_core_fabric_lib.c | 8 +-
+ drivers/target/target_core_file.c | 43 +++-
+ drivers/target/target_core_file.h | 1 +
+ drivers/target/target_core_iblock.c | 17 +-
+ drivers/target/target_core_pr.c | 14 +-
+ drivers/target/target_core_pscsi.c | 2 +-
+ drivers/target/target_core_sbc.c | 23 +-
+ drivers/target/target_core_spc.c | 48 ++--
+ drivers/target/target_core_stat.c | 1 -
+ drivers/target/target_core_tpg.c | 2 +-
+ drivers/target/target_core_transport.c | 268 ++++++++++++----------
+ drivers/target/tcm_fc/tfc_cmd.c | 1 -
+ drivers/target/tcm_fc/tfc_conf.c | 12 -
+ drivers/target/tcm_fc/tfc_io.c | 4 +-
+ drivers/target/tcm_fc/tfc_sess.c | 1 -
+ drivers/usb/gadget/tcm_usb_gadget.c | 15 +-
+ drivers/vhost/tcm_vhost.c | 81 ++-----
+ drivers/vhost/tcm_vhost.h | 8 +
+ include/target/target_core_backend.h | 3 -
+ include/target/target_core_fabric.h | 5 +-
+ 50 files changed, 640 insertions(+), 735 deletions(-)
+Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
+$ git merge ibft/linux-next
+Already up-to-date.
+Merging isci/all (6734092 isci: add a couple __iomem annotations)
+$ git merge isci/all
+Already up-to-date.
+Merging slave-dma/next (d0fc905 dma: tegra: fix interrupt name issue with apb dma.)
+$ git merge slave-dma/next
+Resolved 'drivers/dma/mmp_tdma.c' using previous resolution.
+Resolved 'drivers/mmc/host/davinci_mmc.c' using previous resolution.
+Resolved 'drivers/spi/spi-davinci.c' using previous resolution.
+Auto-merging drivers/spi/spi-davinci.c
+CONFLICT (content): Merge conflict in drivers/spi/spi-davinci.c
+Auto-merging drivers/spi/Kconfig
+Auto-merging drivers/mmc/host/davinci_mmc.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
+Auto-merging drivers/dma/tegra20-apb-dma.c
+Auto-merging drivers/dma/pl330.c
+Auto-merging drivers/dma/mmp_tdma.c
+CONFLICT (content): Merge conflict in drivers/dma/mmp_tdma.c
+Auto-merging arch/arm/mach-spear13xx/spear13xx.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f10114f] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-exynos/dma.c | 2 +
+ arch/arm/mach-spear13xx/spear13xx.c | 3 +
+ arch/avr32/mach-at32ap/at32ap700x.c | 3 +
+ drivers/dma/Kconfig | 17 +
+ drivers/dma/Makefile | 2 +
+ drivers/dma/amba-pl08x.c | 2 +
+ drivers/dma/dw_dmac.c | 258 +++++++---
+ drivers/dma/dw_dmac_regs.h | 48 +-
+ drivers/dma/edma.c | 671 +++++++++++++++++++++++++
+ drivers/dma/ioat/dma_v2.c | 3 +-
+ drivers/dma/ioat/pci.c | 22 +
+ drivers/dma/mmp_pdma.c | 875 +++++++++++++++++++++++++++++++++
+ drivers/dma/mmp_tdma.c | 51 +-
+ drivers/dma/mxs-dma.c | 14 +-
+ drivers/dma/pl330.c | 76 +--
+ drivers/dma/sirf-dma.c | 23 +-
+ drivers/dma/ste_dma40.c | 14 +-
+ drivers/dma/tegra20-apb-dma.c | 12 +-
+ drivers/mmc/host/davinci_mmc.c | 271 +++-------
+ drivers/spi/Kconfig | 1 +
+ drivers/spi/spi-davinci.c | 292 +++++------
+ include/linux/dw_dmac.h | 7 +
+ include/linux/edma.h | 29 ++
+ include/linux/platform_data/mmp_dma.h | 19 +
+ 24 files changed, 2166 insertions(+), 549 deletions(-)
+ create mode 100644 drivers/dma/edma.c
+ create mode 100644 drivers/dma/mmp_pdma.c
+ create mode 100644 include/linux/edma.h
+ create mode 100644 include/linux/platform_data/mmp_dma.h
+$ git am -3 ../patches/DMA__PL330__Fix_build_error_on_linux-next-20120924.patch
+Applying: DMA: PL330: Fix build error (on linux-next-20120924)
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/dma/pl330.c
+$ git add .
+$ git commit -v -a --amend
+[master 47ab782] Merge remote-tracking branch 'slave-dma/next'
+Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
+$ git merge net-next/master
+Already up-to-date.
+Merging wireless-next/master (5160b46 ath9k: Fix BTCOEX weight initialization)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (dfee1eb Bluetooth: remove unused member of hci_dev.)
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/rfcomm/tty.c
+Auto-merging net/bluetooth/rfcomm/sock.c
+Auto-merging net/bluetooth/mgmt.c
+Auto-merging net/bluetooth/l2cap_core.c
+Auto-merging net/bluetooth/hci_core.c
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btmrvl_sdio.c | 24 +-
+ include/net/bluetooth/a2mp.h | 22 ++
+ include/net/bluetooth/amp.h | 50 ++++
+ include/net/bluetooth/bluetooth.h | 1 -
+ include/net/bluetooth/hci.h | 39 +++-
+ include/net/bluetooth/hci_core.h | 13 +-
+ include/net/bluetooth/l2cap.h | 4 +
+ net/bluetooth/Kconfig | 1 +
+ net/bluetooth/Makefile | 2 +-
+ net/bluetooth/a2mp.c | 458 ++++++++++++++++++++++++++++++++++---
+ net/bluetooth/af_bluetooth.c | 10 +-
+ net/bluetooth/amp.c | 367 +++++++++++++++++++++++++++++
+ net/bluetooth/bnep/core.c | 3 +-
+ net/bluetooth/cmtp/core.c | 2 +-
+ net/bluetooth/hci_conn.c | 6 +-
+ net/bluetooth/hci_core.c | 30 +--
+ net/bluetooth/hci_event.c | 141 +++++++++++-
+ net/bluetooth/hci_sysfs.c | 10 +-
+ net/bluetooth/hidp/core.c | 8 +-
+ net/bluetooth/l2cap_core.c | 84 ++++---
+ net/bluetooth/lib.c | 14 --
+ net/bluetooth/mgmt.c | 5 +-
+ net/bluetooth/rfcomm/core.c | 15 +-
+ net/bluetooth/rfcomm/sock.c | 9 +-
+ net/bluetooth/rfcomm/tty.c | 6 +-
+ net/bluetooth/sco.c | 12 +-
+ 26 files changed, 1185 insertions(+), 151 deletions(-)
+ create mode 100644 include/net/bluetooth/amp.h
+ create mode 100644 net/bluetooth/amp.c
+Merging mtd/master (e2d3a35 mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID)
+$ git merge mtd/master
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'arch/arm/mach-imx/clk-imx51-imx53.c' using previous resolution.
+Resolved 'drivers/mtd/nand/Kconfig' using previous resolution.
+Resolved 'drivers/mtd/nand/orion_nand.c' using previous resolution.
+Auto-merging fs/jffs2/super.c
+Auto-merging drivers/mtd/nand/s3c2410.c
+Auto-merging drivers/mtd/nand/pxa3xx_nand.c
+Auto-merging drivers/mtd/nand/orion_nand.c
+CONFLICT (content): Merge conflict in drivers/mtd/nand/orion_nand.c
+Auto-merging drivers/mtd/nand/omap2.c
+CONFLICT (modify/delete): drivers/mtd/nand/nand_bcm_umi.h deleted in mtd/master and modified in HEAD. Version HEAD of drivers/mtd/nand/nand_bcm_umi.h left in tree.
+Removing drivers/mtd/nand/nand_bcm_umi.c
+Auto-merging drivers/mtd/nand/mxc_nand.c
+Auto-merging drivers/mtd/nand/fsl_ifc_nand.c
+Auto-merging drivers/mtd/nand/davinci_nand.c
+CONFLICT (modify/delete): drivers/mtd/nand/bcm_umi_nand.c deleted in mtd/master and modified in HEAD. Version HEAD of drivers/mtd/nand/bcm_umi_nand.c left in tree.
+Removing drivers/mtd/nand/bcm_umi_bch.c
+Auto-merging drivers/mtd/nand/ams-delta.c
+Auto-merging drivers/mtd/nand/Kconfig
+CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig
+Auto-merging drivers/mtd/mtdpart.c
+Auto-merging drivers/mtd/mtdoops.c
+Removing drivers/mtd/maps/wr_sbc82xx_flash.c
+Auto-merging arch/powerpc/configs/mpc83xx_defconfig
+Auto-merging arch/arm/mach-imx/clk-imx51-imx53.c
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx51-imx53.c
+CONFLICT (modify/delete): arch/arm/configs/bcmring_defconfig deleted in HEAD and modified in mtd/master. Version mtd/master of arch/arm/configs/bcmring_defconfig left in tree.
+Auto-merging arch/arm/boot/dts/imx53.dtsi
+Auto-merging arch/arm/boot/dts/imx51.dtsi
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/configs/bcmring_defconfig drivers/mtd/nand/bcm_umi_nand.c drivers/mtd/nand/nand_bcm_umi.h
+arch/arm/configs/bcmring_defconfig: needs merge
+drivers/mtd/nand/bcm_umi_nand.c: needs merge
+drivers/mtd/nand/nand_bcm_umi.h: needs merge
+rm 'arch/arm/configs/bcmring_defconfig'
+rm 'drivers/mtd/nand/bcm_umi_nand.c'
+rm 'drivers/mtd/nand/nand_bcm_umi.h'
+$ git commit -v -a
+[master beaf947] Merge remote-tracking branch 'mtd/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/mtdnand.tmpl | 2 -
+ .../devicetree/bindings/arm/davinci/nand.txt | 51 +
+ .../devicetree/bindings/mtd/atmel-nand.txt | 40 +-
+ .../devicetree/bindings/mtd/gpmi-nand.txt | 4 +
+ .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 50 +
+ .../devicetree/bindings/mtd/lpc32xx-slc.txt | 52 +
+ .../devicetree/bindings/mtd/mtd-physmap.txt | 7 +
+ arch/arm/boot/dts/imx51.dtsi | 7 +
+ arch/arm/boot/dts/imx53.dtsi | 7 +
+ arch/arm/configs/cam60_defconfig | 1 -
+ arch/arm/configs/corgi_defconfig | 1 -
+ arch/arm/configs/ep93xx_defconfig | 1 -
+ arch/arm/configs/mini2440_defconfig | 1 -
+ arch/arm/configs/mv78xx0_defconfig | 1 -
+ arch/arm/configs/nhk8815_defconfig | 1 -
+ arch/arm/configs/orion5x_defconfig | 1 -
+ arch/arm/configs/pxa3xx_defconfig | 1 -
+ arch/arm/configs/spitz_defconfig | 1 -
+ arch/arm/mach-clps711x/autcpu12.c | 19 +
+ arch/arm/mach-imx/clk-imx51-imx53.c | 2 +
+ arch/arm/plat-mxc/devices/platform-mxc_nand.c | 11 +-
+ arch/blackfin/configs/BF561-ACVILON_defconfig | 1 -
+ arch/mips/configs/rb532_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1 -
+ arch/powerpc/configs/mpc83xx_defconfig | 1 -
+ drivers/mtd/Kconfig | 7 +
+ drivers/mtd/Makefile | 1 +
+ drivers/mtd/bcm47xxpart.c | 202 ++++
+ drivers/mtd/chips/Kconfig | 11 +-
+ drivers/mtd/chips/cfi_cmdset_0001.c | 14 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 67 ++
+ drivers/mtd/cmdlinepart.c | 183 ++--
+ drivers/mtd/devices/Kconfig | 10 +-
+ drivers/mtd/devices/Makefile | 1 +
+ drivers/mtd/devices/bcm47xxsflash.c | 105 ++
+ drivers/mtd/devices/doc2001plus.c | 14 +-
+ drivers/mtd/devices/docg3.c | 12 +-
+ drivers/mtd/devices/m25p80.c | 24 +-
+ drivers/mtd/devices/spear_smi.c | 141 +--
+ drivers/mtd/maps/Kconfig | 16 +-
+ drivers/mtd/maps/Makefile | 1 -
+ drivers/mtd/maps/autcpu12-nvram.c | 153 +--
+ drivers/mtd/maps/pci.c | 23 -
+ drivers/mtd/maps/physmap_of.c | 14 +
+ drivers/mtd/maps/rbtx4939-flash.c | 2 -
+ drivers/mtd/maps/uclinux.c | 15 +-
+ drivers/mtd/maps/wr_sbc82xx_flash.c | 174 ----
+ drivers/mtd/mtdcore.c | 21 +
+ drivers/mtd/mtdoops.c | 14 +-
+ drivers/mtd/mtdpart.c | 5 +-
+ drivers/mtd/nand/Kconfig | 63 +-
+ drivers/mtd/nand/Makefile | 4 +-
+ drivers/mtd/nand/ams-delta.c | 13 -
+ drivers/mtd/nand/atmel_nand.c | 987 +++++++++++++++++--
+ drivers/mtd/nand/atmel_nand_ecc.h | 114 ++-
+ drivers/mtd/nand/au1550nd.c | 46 -
+ drivers/mtd/nand/bcm_umi_bch.c | 217 ----
+ drivers/mtd/nand/bcm_umi_nand.c | 555 -----------
+ drivers/mtd/nand/bf5xx_nand.c | 6 +-
+ drivers/mtd/nand/cafe_nand.c | 20 +-
+ drivers/mtd/nand/cmx270_nand.c | 13 -
+ drivers/mtd/nand/davinci_nand.c | 78 +-
+ drivers/mtd/nand/denali.c | 12 +-
+ drivers/mtd/nand/diskonchip.c | 63 --
+ drivers/mtd/nand/docg4.c | 43 +-
+ drivers/mtd/nand/fsl_elbc_nand.c | 51 +-
+ drivers/mtd/nand/fsl_ifc_nand.c | 52 +-
+ drivers/mtd/nand/gpio.c | 54 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 322 +++++-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 152 ++-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 26 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 12 +
+ drivers/mtd/nand/lpc32xx_mlc.c | 924 +++++++++++++++++
+ drivers/mtd/nand/lpc32xx_slc.c | 1039 ++++++++++++++++++++
+ drivers/mtd/nand/mpc5121_nfc.c | 22 -
+ drivers/mtd/nand/mxc_nand.c | 168 ++--
+ drivers/mtd/nand/nand_base.c | 529 ++++++----
+ drivers/mtd/nand/nand_bbt.c | 148 +--
+ drivers/mtd/nand/nand_bcm_umi.c | 149 ---
+ drivers/mtd/nand/nand_bcm_umi.h | 336 -------
+ drivers/mtd/nand/nand_ids.c | 7 +-
+ drivers/mtd/nand/nandsim.c | 17 +-
+ drivers/mtd/nand/ndfc.c | 13 -
+ drivers/mtd/nand/nuc900_nand.c | 17 -
+ drivers/mtd/nand/omap2.c | 36 +-
+ drivers/mtd/nand/orion_nand.c | 1 -
+ drivers/mtd/nand/plat_nand.c | 5 +
+ drivers/mtd/nand/pxa3xx_nand.c | 12 +-
+ drivers/mtd/nand/r852.c | 22 -
+ drivers/mtd/nand/s3c2410.c | 191 ++--
+ drivers/mtd/nand/sh_flctl.c | 327 +++---
+ drivers/mtd/nand/socrates_nand.c | 19 -
+ drivers/mtd/nand/tmio_nand.c | 13 -
+ drivers/mtd/nand/txx9ndfmc.c | 13 -
+ drivers/mtd/nand/xway_nand.c | 201 ++++
+ drivers/mtd/sm_ftl.c | 1 -
+ drivers/mtd/tests/Makefile | 1 +
+ drivers/mtd/tests/mtd_nandbiterrs.c | 460 +++++++++
+ drivers/mtd/tests/mtd_nandecctest.c | 294 +++++-
+ drivers/mtd/tests/mtd_speedtest.c | 16 +-
+ drivers/mtd/tests/mtd_stresstest.c | 39 +-
+ fs/jffs2/super.c | 4 +
+ fs/jffs2/wbuf.c | 8 +-
+ include/linux/bcma/bcma_driver_chipcommon.h | 2 +
+ include/linux/mtd/bbm.h | 7 +-
+ include/linux/mtd/lpc32xx_mlc.h | 20 +
+ include/linux/mtd/lpc32xx_slc.h | 20 +
+ include/linux/mtd/mtd.h | 9 +-
+ include/linux/mtd/nand.h | 72 +-
+ include/linux/mtd/sh_flctl.h | 23 +-
+ 111 files changed, 6351 insertions(+), 3233 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/davinci/nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt
+ create mode 100644 drivers/mtd/bcm47xxpart.c
+ create mode 100644 drivers/mtd/devices/bcm47xxsflash.c
+ delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c
+ delete mode 100644 drivers/mtd/nand/bcm_umi_bch.c
+ delete mode 100644 drivers/mtd/nand/bcm_umi_nand.c
+ create mode 100644 drivers/mtd/nand/lpc32xx_mlc.c
+ create mode 100644 drivers/mtd/nand/lpc32xx_slc.c
+ delete mode 100644 drivers/mtd/nand/nand_bcm_umi.c
+ delete mode 100644 drivers/mtd/nand/nand_bcm_umi.h
+ create mode 100644 drivers/mtd/nand/xway_nand.c
+ create mode 100644 drivers/mtd/tests/mtd_nandbiterrs.c
+ create mode 100644 include/linux/mtd/lpc32xx_mlc.h
+ create mode 100644 include/linux/mtd/lpc32xx_slc.h
+Merging l2-mtd/master (35c241d mtd: onenand: Make flexonenand_set_boundary static)
+$ git merge l2-mtd/master
+Merge made by the 'recursive' strategy.
+ drivers/mtd/devices/slram.c | 2 +-
+ drivers/mtd/onenand/onenand_base.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging crypto/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
+$ git merge crypto/master
+Already up-to-date.
+Merging drm/drm-next (268d283 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next)
+$ git merge drm/drm-next
+Already up-to-date.
+Merging sound/for-next (7ff34ad ALSA: hda - Add new codec ALC283 ALC290 support)
+$ git merge sound/for-next
+Recorded preimage for 'arch/arm/mach-davinci/include/mach/da8xx.h'
+Resolved 'arch/arm/mach-davinci/davinci.h' using previous resolution.
+Resolved 'arch/arm/mach-davinci/dm355.c' using previous resolution.
+Resolved 'arch/arm/mach-davinci/dm365.c' using previous resolution.
+Resolved 'arch/arm/mach-imx/mach-imx27_visstrim_m10.c' using previous resolution.
+Resolved 'sound/soc/omap/omap-mcbsp.c' using previous resolution.
+Resolved 'sound/soc/omap/omap-pcm.c' using previous resolution.
+Auto-merging sound/usb/endpoint.c
+Auto-merging sound/soc/soc-core.c
+Auto-merging sound/soc/omap/zoom2.c
+CONFLICT (modify/delete): sound/soc/omap/overo.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/overo.c left in tree.
+CONFLICT (modify/delete): sound/soc/omap/omap3evm.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/omap3evm.c left in tree.
+CONFLICT (modify/delete): sound/soc/omap/omap3beagle.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/omap3beagle.c left in tree.
+Auto-merging sound/soc/omap/omap-pcm.c
+CONFLICT (content): Merge conflict in sound/soc/omap/omap-pcm.c
+Auto-merging sound/soc/omap/omap-mcpdm.c
+Auto-merging sound/soc/omap/omap-mcbsp.c
+CONFLICT (content): Merge conflict in sound/soc/omap/omap-mcbsp.c
+Auto-merging sound/soc/omap/omap-abe-twl6040.c
+Auto-merging sound/soc/omap/mcbsp.c
+CONFLICT (modify/delete): sound/soc/omap/igep0020.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/igep0020.c left in tree.
+Auto-merging sound/soc/omap/am3517evm.c
+Auto-merging sound/soc/fsl/imx-ssi.c
+Auto-merging sound/soc/fsl/imx-pcm-dma.c
+Auto-merging sound/soc/codecs/wm5100.c
+Auto-merging sound/soc/codecs/wm2000.c
+Auto-merging sound/pci/oxygen/oxygen_lib.c
+Removing include/sound/version.h
+Auto-merging include/sound/tegra_wm8903.h
+Auto-merging include/sound/pcm.h
+Auto-merging include/sound/ad1816a.h
+Auto-merging include/sound/ac97_codec.h
+Auto-merging include/linux/platform_data/davinci_asp.h
+Auto-merging include/linux/platform_data/asoc-ti-mcbsp.h
+Auto-merging include/linux/i2c/twl.h
+Auto-merging drivers/dma/tegra20-apb-dma.c
+Auto-merging drivers/dma/ste_dma40.c
+Auto-merging drivers/dma/sirf-dma.c
+Auto-merging drivers/dma/pl330.c
+Auto-merging drivers/dma/omap-dma.c
+Auto-merging drivers/dma/mxs-dma.c
+Auto-merging drivers/dma/mmp_tdma.c
+Auto-merging drivers/dma/imx-sdma.c
+Auto-merging drivers/dma/imx-dma.c
+Auto-merging drivers/dma/ep93xx_dma.c
+Auto-merging drivers/dma/at_hdmac.c
+Auto-merging arch/arm/mach-omap2/twl-common.h
+Auto-merging arch/arm/mach-omap2/twl-common.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+Auto-merging arch/arm/mach-omap2/mcbsp.c
+Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c
+Auto-merging arch/arm/mach-omap2/board-overo.c
+Auto-merging arch/arm/mach-omap2/board-omap3evm.c
+Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
+Auto-merging arch/arm/mach-omap2/board-igep0020.c
+Auto-merging arch/arm/mach-omap2/board-devkit8000.c
+Auto-merging arch/arm/mach-omap2/board-cm-t35.c
+Auto-merging arch/arm/mach-omap2/board-am3517evm.c
+Auto-merging arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+Auto-merging arch/arm/mach-davinci/include/mach/da8xx.h
+CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/da8xx.h
+Auto-merging arch/arm/mach-davinci/dm644x.c
+Auto-merging arch/arm/mach-davinci/dm365.c
+CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm365.c
+Auto-merging arch/arm/mach-davinci/dm355.c
+CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
+Auto-merging arch/arm/mach-davinci/devices.c
+Auto-merging arch/arm/mach-davinci/davinci.h
+CONFLICT (content): Merge conflict in arch/arm/mach-davinci/davinci.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f sound/soc/omap/igep0020.c sound/soc/omap/omap3beagle.c sound/soc/omap/omap3evm.c sound/soc/omap/overo.c
+sound/soc/omap/igep0020.c: needs merge
+sound/soc/omap/omap3beagle.c: needs merge
+sound/soc/omap/omap3evm.c: needs merge
+sound/soc/omap/overo.c: needs merge
+rm 'sound/soc/omap/igep0020.c'
+rm 'sound/soc/omap/omap3beagle.c'
+rm 'sound/soc/omap/omap3evm.c'
+rm 'sound/soc/omap/overo.c'
+$ git commit -v -a
+Recorded resolution for 'arch/arm/mach-davinci/include/mach/da8xx.h'.
+[master c1e9fb2] Merge remote-tracking branch 'sound/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/sound/cs4270.txt | 21 +
+ Documentation/devicetree/bindings/sound/cs4271.txt | 36 +
+ .../bindings/sound/davinci-mcasp-audio.txt | 45 +
+ .../devicetree/bindings/sound/omap-abe-twl6040.txt | 91 ++
+ .../devicetree/bindings/sound/omap-mcbsp.txt | 37 +
+ .../devicetree/bindings/sound/omap-twl4030.txt | 17 +
+ .../devicetree/bindings/sound/tlv320aic3x.txt | 20 +
+ Documentation/sound/alsa/ALSA-Configuration.txt | 10 +-
+ Documentation/sound/alsa/Channel-Mapping-API.txt | 153 ++
+ Documentation/sound/alsa/HD-Audio-Models.txt | 3 +-
+ arch/arm/mach-davinci/asp.h | 49 +
+ arch/arm/mach-davinci/davinci.h | 3 +-
+ arch/arm/mach-davinci/devices-da8xx.c | 8 +-
+ arch/arm/mach-davinci/devices.c | 11 -
+ arch/arm/mach-davinci/dm355.c | 2 +-
+ arch/arm/mach-davinci/dm365.c | 2 +-
+ arch/arm/mach-davinci/dm644x.c | 2 +-
+ arch/arm/mach-davinci/dm646x.c | 2 +-
+ arch/arm/mach-davinci/include/mach/da8xx.h | 2 +-
+ arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 +
+ arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 1 +
+ arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 1 +
+ arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 1 +
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 42 +-
+ arch/arm/mach-omap2/board-am3517evm.c | 13 +
+ arch/arm/mach-omap2/board-cm-t35.c | 1 +
+ arch/arm/mach-omap2/board-devkit8000.c | 1 +
+ arch/arm/mach-omap2/board-igep0020.c | 1 +
+ arch/arm/mach-omap2/board-omap3beagle.c | 1 +
+ arch/arm/mach-omap2/board-omap3evm.c | 1 +
+ arch/arm/mach-omap2/board-overo.c | 1 +
+ arch/arm/mach-omap2/board-zoom-peripherals.c | 9 +-
+ arch/arm/mach-omap2/include/mach/board-zoom.h | 2 -
+ arch/arm/mach-omap2/mcbsp.c | 126 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +
+ arch/arm/mach-omap2/twl-common.c | 27 +
+ arch/arm/mach-omap2/twl-common.h | 2 +
+ arch/arm/plat-samsung/dma-ops.c | 3 +-
+ arch/blackfin/mach-bf527/boards/ezkit.c | 20 +
+ arch/blackfin/mach-bf533/boards/stamp.c | 20 +
+ arch/blackfin/mach-bf537/boards/stamp.c | 20 +
+ arch/blackfin/mach-bf561/boards/ezkit.c | 20 +
+ arch/blackfin/mach-bf609/boards/ezkit.c | 19 +
+ drivers/dma/at_hdmac.c | 3 +-
+ drivers/dma/ep93xx_dma.c | 4 +-
+ drivers/dma/imx-dma.c | 2 +-
+ drivers/dma/imx-sdma.c | 2 +-
+ drivers/dma/mmp_tdma.c | 2 +-
+ drivers/dma/mxs-dma.c | 2 +-
+ drivers/dma/omap-dma.c | 45 +-
+ drivers/dma/pl330.c | 2 +-
+ drivers/dma/sa11x0-dma.c | 2 +-
+ drivers/dma/sirf-dma.c | 2 +-
+ drivers/dma/ste_dma40.c | 3 +-
+ drivers/dma/tegra20-apb-dma.c | 2 +-
+ include/linux/dmaengine.h | 7 +-
+ include/linux/i2c/twl.h | 2 +-
+ include/linux/mfd/wm8994/pdata.h | 4 +
+ include/linux/platform_data/asoc-mx27vis.h | 11 +
+ include/linux/platform_data/asoc-ti-mcbsp.h | 2 -
+ .../linux/platform_data/davinci_asp.h | 74 +-
+ include/linux/platform_data/omap-twl4030.h | 32 +
+ include/sound/ac97_codec.h | 3 +
+ include/sound/ad1816a.h | 9 +-
+ include/sound/asound.h | 39 +
+ include/sound/compress_driver.h | 1 +
+ include/sound/compress_params.h | 1 +
+ include/sound/da9055.h | 33 +
+ include/sound/emu10k1.h | 4 +-
+ include/sound/initval.h | 14 +
+ include/sound/memalloc.h | 27 +-
+ include/sound/pcm.h | 87 +-
+ include/sound/soc-dai.h | 3 +
+ include/sound/soc-dapm.h | 10 +-
+ include/sound/soc.h | 20 +-
+ .../sound/tegra_wm8903.h | 7 +-
+ include/sound/tlv.h | 8 +
+ include/sound/version.h | 3 -
+ include/sound/wm0010.h | 27 +
+ include/sound/wm8960.h | 2 +-
+ include/sound/wm8993.h | 4 +
+ sound/core/compress_offload.c | 26 +
+ sound/core/control.c | 1 +
+ sound/core/info.c | 7 +-
+ sound/core/info_oss.c | 3 +-
+ sound/core/oss/mixer_oss.c | 2 +
+ sound/core/pcm.c | 4 +
+ sound/core/pcm_lib.c | 214 +++
+ sound/core/pcm_memory.c | 26 -
+ sound/core/seq/seq_device.c | 2 +
+ sound/core/sgbuf.c | 27 +
+ sound/core/sound.c | 3 +-
+ sound/drivers/aloop.c | 6 +
+ sound/drivers/opl3/opl3_midi.c | 2 +-
+ sound/drivers/opl4/opl4_synth.c | 9 +-
+ sound/drivers/vx/vx_pcm.c | 2 +-
+ sound/isa/Kconfig | 12 +
+ sound/isa/Makefile | 2 +
+ sound/isa/ad1816a/ad1816a.c | 64 +-
+ sound/isa/ad1816a/ad1816a_lib.c | 38 +-
+ sound/isa/cmi8328.c | 483 +++++++
+ sound/isa/gus/interwave.c | 5 +-
+ sound/isa/opti9xx/miro.c | 15 +-
+ sound/isa/opti9xx/opti92x-ad1848.c | 14 +-
+ sound/isa/sb/emu8000.c | 15 +-
+ sound/isa/sb/emu8000_callback.c | 2 +-
+ sound/isa/wavefront/wavefront_synth.c | 2 +-
+ sound/last.c | 1 -
+ sound/oss/audio.c | 2 +-
+ sound/oss/opl3.c | 2 +-
+ sound/oss/pss.c | 2 +-
+ sound/oss/sb_ess.c | 22 +-
+ sound/oss/sb_mixer.c | 4 +-
+ sound/oss/sys_timer.c | 4 +-
+ sound/oss/uart6850.c | 2 +-
+ sound/pci/ac97/ac97_patch.c | 24 +-
+ sound/pci/ali5451/ali5451.c | 10 +-
+ sound/pci/als300.c | 2 +-
+ sound/pci/als4000.c | 4 +-
+ sound/pci/asihpi/asihpi.c | 4 +-
+ sound/pci/atiixp.c | 15 +-
+ sound/pci/atiixp_modem.c | 6 +-
+ sound/pci/au88x0/au88x0_game.c | 2 +-
+ sound/pci/au88x0/au88x0_pcm.c | 2 +-
+ sound/pci/azt3328.c | 6 +-
+ sound/pci/ca0106/ca0106.h | 4 +-
+ sound/pci/ca0106/ca0106_main.c | 30 +-
+ sound/pci/ca0106/ca0106_mixer.c | 4 +-
+ sound/pci/cmipci.c | 12 +-
+ sound/pci/cs4281.c | 6 +-
+ sound/pci/cs46xx/cs46xx.c | 2 +-
+ sound/pci/cs46xx/cs46xx.h | 2 +-
+ sound/pci/cs46xx/cs46xx_lib.c | 8 +-
+ sound/pci/cs46xx/cs46xx_lib.h | 2 +-
+ sound/pci/cs46xx/dsp_spos.c | 8 +-
+ sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +-
+ sound/pci/cs5530.c | 3 +-
+ sound/pci/cs5535audio/Makefile | 2 +-
+ sound/pci/cs5535audio/cs5535audio.c | 2 +-
+ sound/pci/ctxfi/ctatc.c | 4 +-
+ sound/pci/ctxfi/ctatc.h | 2 +-
+ sound/pci/ctxfi/cthardware.h | 2 +-
+ sound/pci/ctxfi/cthw20k1.c | 4 +-
+ sound/pci/ctxfi/cthw20k2.c | 4 +-
+ sound/pci/ctxfi/ctmixer.c | 4 +-
+ sound/pci/ctxfi/ctmixer.h | 2 +-
+ sound/pci/ctxfi/ctpcm.c | 52 +-
+ sound/pci/ctxfi/xfi.c | 2 +-
+ sound/pci/echoaudio/echoaudio.c | 12 +-
+ sound/pci/echoaudio/echoaudio.h | 2 +-
+ sound/pci/emu10k1/emu10k1.c | 4 +-
+ sound/pci/emu10k1/emu10k1_callback.c | 2 +-
+ sound/pci/emu10k1/emu10k1_main.c | 8 +-
+ sound/pci/emu10k1/emu10k1x.c | 21 +
+ sound/pci/emu10k1/emufx.c | 2 +-
+ sound/pci/emu10k1/emupcm.c | 2 +-
+ sound/pci/emu10k1/memory.c | 4 +-
+ sound/pci/emu10k1/p16v.c | 2 +-
+ sound/pci/ens1370.c | 70 +-
+ sound/pci/es1938.c | 6 +-
+ sound/pci/es1968.c | 12 +-
+ sound/pci/fm801.c | 13 +-
+ sound/pci/hda/Kconfig | 10 +-
+ sound/pci/hda/hda_auto_parser.c | 56 +-
+ sound/pci/hda/hda_codec.c | 276 ++--
+ sound/pci/hda/hda_codec.h | 82 +-
+ sound/pci/hda/hda_generic.c | 8 +-
+ sound/pci/hda/hda_hwdep.c | 43 +-
+ sound/pci/hda/hda_intel.c | 306 +++-
+ sound/pci/hda/hda_jack.c | 37 +-
+ sound/pci/hda/hda_jack.h | 9 +
+ sound/pci/hda/hda_local.h | 2 +-
+ sound/pci/hda/hda_proc.c | 9 +-
+ sound/pci/hda/hda_trace.h | 26 +
+ sound/pci/hda/patch_analog.c | 90 +-
+ sound/pci/hda/patch_cirrus.c | 225 +--
+ sound/pci/hda/patch_conexant.c | 78 +-
+ sound/pci/hda/patch_hdmi.c | 407 +++++-
+ sound/pci/hda/patch_realtek.c | 119 +-
+ sound/pci/hda/patch_sigmatel.c | 115 +-
+ sound/pci/hda/patch_via.c | 37 +-
+ sound/pci/ice1712/aureon.c | 4 +-
+ sound/pci/ice1712/ice1712.h | 2 +-
+ sound/pci/ice1712/ice1724.c | 4 +-
+ sound/pci/ice1712/juli.c | 4 +-
+ sound/pci/ice1712/prodigy_hifi.c | 4 +-
+ sound/pci/intel8x0.c | 26 +-
+ sound/pci/intel8x0m.c | 4 +-
+ sound/pci/korg1212/korg1212.c | 4 +-
+ sound/pci/maestro3.c | 10 +-
+ sound/pci/mixart/mixart_hwdep.c | 2 +-
+ sound/pci/nm256/nm256.c | 4 +-
+ sound/pci/oxygen/oxygen.c | 2 +-
+ sound/pci/oxygen/oxygen.h | 2 +-
+ sound/pci/oxygen/oxygen_lib.c | 4 +-
+ sound/pci/oxygen/virtuoso.c | 2 +-
+ sound/pci/pcxhr/pcxhr.c | 24 +
+ sound/pci/pcxhr/pcxhr_hwdep.c | 6 +-
+ sound/pci/riptide/riptide.c | 6 +-
+ sound/pci/sis7019.c | 6 +-
+ sound/pci/trident/trident.c | 2 +-
+ sound/pci/trident/trident_main.c | 4 +-
+ sound/pci/via82xx.c | 33 +-
+ sound/pci/via82xx_modem.c | 4 +-
+ sound/pci/vx222/vx222.c | 2 +-
+ sound/pci/ymfpci/ymfpci.c | 2 +-
+ sound/pci/ymfpci/ymfpci.h | 2 +-
+ sound/pci/ymfpci/ymfpci_main.c | 26 +-
+ sound/soc/Kconfig | 3 +-
+ sound/soc/Makefile | 4 +-
+ sound/soc/blackfin/bf5xx-ad1836.c | 73 +-
+ sound/soc/{ep93xx => cirrus}/Kconfig | 0
+ sound/soc/{ep93xx => cirrus}/Makefile | 0
+ sound/soc/{ep93xx => cirrus}/edb93xx.c | 0
+ sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c | 0
+ sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c | 0
+ sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c | 0
+ sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h | 0
+ sound/soc/{ep93xx => cirrus}/simone.c | 0
+ sound/soc/{ep93xx => cirrus}/snappercl15.c | 0
+ sound/soc/codecs/Kconfig | 8 +
+ sound/soc/codecs/Makefile | 4 +
+ sound/soc/codecs/ab8500-codec.c | 13 +-
+ sound/soc/codecs/ad1836.c | 88 +-
+ sound/soc/codecs/ad193x.c | 50 +-
+ sound/soc/codecs/ad1980.c | 1 -
+ sound/soc/codecs/adau1373.c | 12 +-
+ sound/soc/codecs/adau1701.c | 12 +-
+ sound/soc/codecs/ak4671.c | 12 +-
+ sound/soc/codecs/arizona.c | 110 +-
+ sound/soc/codecs/arizona.h | 8 +-
+ sound/soc/codecs/cs4270.c | 156 +-
+ sound/soc/codecs/cs4271.c | 24 +-
+ sound/soc/codecs/cs42l51.c | 19 +-
+ sound/soc/codecs/cs42l52.c | 1 -
+ sound/soc/codecs/da9055.c | 1510 ++++++++++++++++++++
+ sound/soc/codecs/isabelle.c | 1 -
+ sound/soc/codecs/lm4857.c | 12 +-
+ sound/soc/codecs/max98088.c | 18 +-
+ sound/soc/codecs/max98095.c | 18 +-
+ sound/soc/codecs/max9850.c | 12 +-
+ sound/soc/codecs/max9877.c | 12 +-
+ sound/soc/codecs/mc13783.c | 60 +-
+ sound/soc/codecs/sta32x.c | 151 +-
+ sound/soc/codecs/sta529.c | 2 +-
+ sound/soc/codecs/stac9766.c | 1 -
+ sound/soc/codecs/tlv320aic26.c | 12 +-
+ sound/soc/codecs/tlv320aic32x4.c | 19 +-
+ sound/soc/codecs/tlv320aic3x.c | 49 +-
+ sound/soc/codecs/tlv320dac33.c | 19 +-
+ sound/soc/codecs/tpa6130a2.c | 13 +-
+ sound/soc/codecs/twl4030.c | 157 +-
+ sound/soc/codecs/twl6040.c | 43 +-
+ sound/soc/codecs/wm0010.c | 940 ++++++++++++
+ sound/soc/codecs/wm2000.c | 72 +-
+ sound/soc/codecs/wm2200.c | 16 +-
+ sound/soc/codecs/wm5100.c | 6 +-
+ sound/soc/codecs/wm5102.c | 52 +-
+ sound/soc/codecs/wm5110.c | 95 +-
+ sound/soc/codecs/wm8510.c | 129 +-
+ sound/soc/codecs/wm8523.c | 184 ++-
+ sound/soc/codecs/wm8580.c | 149 +-
+ sound/soc/codecs/wm8711.c | 65 +-
+ sound/soc/codecs/wm8728.c | 60 +-
+ sound/soc/codecs/wm8737.c | 132 +-
+ sound/soc/codecs/wm8741.c | 115 +-
+ sound/soc/codecs/wm8770.c | 19 +-
+ sound/soc/codecs/wm8776.c | 75 +-
+ sound/soc/codecs/wm8900.c | 166 ++-
+ sound/soc/codecs/wm8903.c | 18 +-
+ sound/soc/codecs/wm8904.c | 2 -
+ sound/soc/codecs/wm8940.c | 18 +-
+ sound/soc/codecs/wm8955.c | 18 +-
+ sound/soc/codecs/wm8958-dsp2.c | 28 +-
+ sound/soc/codecs/wm8960.c | 150 +-
+ sound/soc/codecs/wm8961.c | 492 +++----
+ sound/soc/codecs/wm8971.c | 18 +-
+ sound/soc/codecs/wm8974.c | 18 +-
+ sound/soc/codecs/wm8978.c | 18 +-
+ sound/soc/codecs/wm8983.c | 162 ++-
+ sound/soc/codecs/wm8990.c | 8 +-
+ sound/soc/codecs/wm8991.c | 25 +-
+ sound/soc/codecs/wm8993.c | 2 +
+ sound/soc/codecs/wm8994.c | 132 +-
+ sound/soc/codecs/wm8994.h | 12 +-
+ sound/soc/codecs/wm8996.c | 2 +-
+ sound/soc/codecs/wm9090.c | 12 +-
+ sound/soc/codecs/wm9712.c | 12 +-
+ sound/soc/codecs/wm9713.c | 1 -
+ sound/soc/codecs/wm_hubs.c | 119 +-
+ sound/soc/codecs/wm_hubs.h | 6 +
+ sound/soc/davinci/davinci-evm.c | 19 +-
+ sound/soc/davinci/davinci-i2s.c | 13 +-
+ sound/soc/davinci/davinci-mcasp.c | 260 +++-
+ sound/soc/davinci/davinci-mcasp.h | 6 +-
+ sound/soc/davinci/davinci-pcm.c | 24 +-
+ sound/soc/davinci/davinci-pcm.h | 6 +-
+ sound/soc/davinci/davinci-sffsdr.c | 2 +-
+ sound/soc/davinci/davinci-vcif.c | 8 +
+ sound/soc/fsl/Kconfig | 2 +-
+ sound/soc/fsl/eukrea-tlv320.c | 37 +-
+ sound/soc/fsl/fsl_dma.c | 6 -
+ sound/soc/fsl/imx-audmux.c | 3 -
+ sound/soc/fsl/imx-pcm-dma.c | 5 +-
+ sound/soc/fsl/imx-ssi.c | 30 +-
+ sound/soc/fsl/mpc5200_dma.c | 24 +-
+ sound/soc/fsl/mpc5200_dma.h | 3 +
+ sound/soc/fsl/mpc5200_psc_ac97.c | 10 +
+ sound/soc/fsl/mpc5200_psc_i2s.c | 8 +
+ sound/soc/fsl/mpc8610_hpcd.c | 32 +-
+ sound/soc/fsl/mx27vis-aic32x4.c | 42 +-
+ sound/soc/fsl/p1022_ds.c | 31 +-
+ sound/soc/fsl/pcm030-audio-fabric.c | 100 +-
+ sound/soc/mid-x86/mfld_machine.c | 9 +
+ sound/soc/mid-x86/sst_dsp.h | 134 ++
+ sound/soc/mid-x86/sst_platform.c | 204 ++-
+ sound/soc/mid-x86/sst_platform.h | 26 +-
+ sound/soc/mxs/mxs-saif.c | 20 +-
+ sound/soc/omap/Kconfig | 51 +-
+ sound/soc/omap/Makefile | 10 +-
+ sound/soc/omap/am3517evm.c | 21 +-
+ sound/soc/omap/igep0020.c | 120 --
+ sound/soc/omap/mcbsp.c | 54 +-
+ sound/soc/omap/mcbsp.h | 3 -
+ sound/soc/omap/omap-abe-twl6040.c | 145 +-
+ sound/soc/omap/omap-dmic.c | 9 +-
+ sound/soc/omap/omap-hdmi.c | 17 +-
+ sound/soc/omap/omap-mcbsp.c | 230 +--
+ sound/soc/omap/omap-mcbsp.h | 20 -
+ sound/soc/omap/omap-mcpdm.c | 92 +-
+ sound/soc/omap/omap-pcm.c | 236 +--
+ sound/soc/omap/omap-pcm.h | 4 +-
+ sound/soc/omap/omap-twl4030.c | 188 +++
+ sound/soc/omap/omap3beagle.c | 150 --
+ sound/soc/omap/omap3evm.c | 118 --
+ sound/soc/omap/overo.c | 122 --
+ sound/soc/omap/zoom2.c | 4 -
+ sound/soc/samsung/Kconfig | 11 +-
+ sound/soc/samsung/Makefile | 2 +
+ sound/soc/samsung/bells.c | 346 +++++
+ sound/soc/samsung/speyside.c | 42 +-
+ sound/soc/sh/fsi.c | 28 +-
+ sound/soc/soc-compress.c | 294 ++++
+ sound/soc/soc-core.c | 100 +-
+ sound/soc/soc-dapm.c | 67 +-
+ sound/soc/soc-dmaengine-pcm.c | 6 +-
+ sound/soc/soc-jack.c | 6 -
+ sound/soc/tegra/tegra_wm8903.c | 3 +-
+ sound/soc/ux500/ux500_msp_dai.c | 3 +
+ sound/soc/ux500/ux500_msp_i2s.c | 2 +
+ sound/sparc/amd7930.c | 4 +-
+ sound/sparc/dbri.c | 2 +-
+ sound/usb/6fire/firmware.c | 5 +-
+ sound/usb/card.c | 2 +
+ sound/usb/card.h | 7 +-
+ sound/usb/endpoint.c | 39 +-
+ sound/usb/endpoint.h | 5 +-
+ sound/usb/helper.c | 5 +
+ sound/usb/mixer.c | 7 +
+ sound/usb/pcm.c | 126 +-
+ sound/usb/quirks-table.h | 53 +
+ sound/usb/quirks.c | 24 +
+ sound/usb/quirks.h | 10 +
+ 363 files changed, 10800 insertions(+), 4219 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/cs4270.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/cs4271.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/omap-mcbsp.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/omap-twl4030.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt
+ create mode 100644 Documentation/sound/alsa/Channel-Mapping-API.txt
+ create mode 100644 arch/arm/mach-davinci/asp.h
+ create mode 100644 include/linux/platform_data/asoc-mx27vis.h
+ rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/davinci_asp.h (56%)
+ create mode 100644 include/linux/platform_data/omap-twl4030.h
+ create mode 100644 include/sound/da9055.h
+ rename arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h => include/sound/tegra_wm8903.h (89%)
+ delete mode 100644 include/sound/version.h
+ create mode 100644 include/sound/wm0010.h
+ create mode 100644 sound/isa/cmi8328.c
+ rename sound/soc/{ep93xx => cirrus}/Kconfig (100%)
+ rename sound/soc/{ep93xx => cirrus}/Makefile (100%)
+ rename sound/soc/{ep93xx => cirrus}/edb93xx.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h (100%)
+ rename sound/soc/{ep93xx => cirrus}/simone.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/snappercl15.c (100%)
+ create mode 100644 sound/soc/codecs/da9055.c
+ create mode 100644 sound/soc/codecs/wm0010.c
+ create mode 100644 sound/soc/mid-x86/sst_dsp.h
+ delete mode 100644 sound/soc/omap/igep0020.c
+ create mode 100644 sound/soc/omap/omap-twl4030.c
+ delete mode 100644 sound/soc/omap/omap3beagle.c
+ delete mode 100644 sound/soc/omap/omap3evm.c
+ delete mode 100644 sound/soc/omap/overo.c
+ create mode 100644 sound/soc/samsung/bells.c
+ create mode 100644 sound/soc/soc-compress.c
+Merging sound-asoc/for-next (a1b98e1 ASoC: wm2200: Fix non-inverted OUT2 mute control)
+$ git merge sound-asoc/for-next
+Auto-merging sound/soc/omap/omap-mcpdm.c
+Auto-merging sound/soc/omap/omap-abe-twl6040.c
+Auto-merging sound/soc/omap/ams-delta.c
+Auto-merging arch/arm/mach-omap1/board-ams-delta.c
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-omap1/board-ams-delta.c | 12 +++++++
+ sound/soc/codecs/twl6040.c | 8 ++---
+ sound/soc/codecs/wm2200.c | 3 +-
+ sound/soc/omap/ams-delta.c | 63 ++++++++++++++++-----------------
+ sound/soc/omap/omap-abe-twl6040.c | 2 +-
+ sound/soc/omap/omap-mcpdm.c | 9 ++---
+ sound/soc/samsung/bells.c | 2 +-
+ 7 files changed, 52 insertions(+), 47 deletions(-)
+Merging modules/modules-next (21536bb MODSIGN: Fix build error with strict typechecking)
+$ git merge modules/modules-next
+Recorded preimage for 'init/Kconfig'
+Resolved 'Makefile' using previous resolution.
+Resolved 'arch/Kconfig' using previous resolution.
+Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'arch/x86/um/Kconfig' using previous resolution.
+Resolved 'arch/xtensa/Kconfig' using previous resolution.
+Auto-merging security/keys/trusted.c
+Auto-merging security/keys/keyring.c
+Auto-merging security/keys/keyctl.c
+Auto-merging security/keys/key.c
+Auto-merging scripts/Makefile.modpost
+Auto-merging net/rxrpc/ar-key.c
+Auto-merging net/dns_resolver/dns_key.c
+Auto-merging kernel/Makefile
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging fs/cifs/cifsacl.c
+Auto-merging crypto/Makefile
+Auto-merging crypto/Kconfig
+Auto-merging arch/xtensa/Kconfig
+CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
+Auto-merging arch/x86/um/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/um/Kconfig
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/unicore32/Kconfig
+Auto-merging arch/tile/Kconfig
+Removing arch/sparc/include/asm/module.h
+Auto-merging arch/sparc/include/asm/Kbuild
+Auto-merging arch/score/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/mips/kernel/Makefile
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/microblaze/Kconfig
+Removing arch/m32r/include/asm/module.h
+Auto-merging arch/m32r/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
+Auto-merging arch/ia64/Kconfig
+Removing arch/h8300/include/asm/module.h
+Auto-merging arch/h8300/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
+Removing arch/cris/include/asm/module.h
+Auto-merging arch/cris/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
+Auto-merging arch/cris/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+CONFLICT (content): Merge conflict in arch/Kconfig
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'init/Kconfig'.
+[master 5e393cb] Merge remote-tracking branch 'modules/modules-next'
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 14 +
+ Documentation/crypto/asymmetric-keys.txt | 312 ++++++
+ Documentation/kernel-parameters.txt | 6 +
+ Documentation/security/keys.txt | 50 +-
+ Makefile | 6 +-
+ arch/Kconfig | 19 +
+ arch/alpha/Kconfig | 2 +
+ arch/alpha/include/asm/module.h | 10 +-
+ arch/arm/Kconfig | 2 +
+ arch/arm/include/asm/module.h | 8 +-
+ arch/avr32/Kconfig | 2 +
+ arch/avr32/include/asm/module.h | 6 +-
+ arch/blackfin/Kconfig | 2 +
+ arch/blackfin/include/asm/module.h | 4 +-
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/include/asm/module.h | 12 +-
+ arch/cris/Kconfig | 1 +
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/module.h | 9 -
+ arch/frv/include/asm/module.h | 8 +-
+ arch/h8300/Kconfig | 1 +
+ arch/h8300/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/module.h | 11 -
+ arch/hexagon/Kconfig | 1 +
+ arch/ia64/Kconfig | 2 +
+ arch/ia64/include/asm/module.h | 6 +-
+ arch/m32r/Kconfig | 1 +
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/module.h | 10 -
+ arch/m32r/kernel/module.c | 15 -
+ arch/m68k/Kconfig | 3 +
+ arch/m68k/include/asm/module.h | 6 +-
+ arch/microblaze/Kconfig | 1 +
+ arch/mips/Kconfig | 3 +
+ arch/mips/include/asm/module.h | 10 +-
+ arch/mips/kernel/Makefile | 1 +
+ arch/mips/kernel/module-rela.c | 145 +++
+ arch/mips/kernel/module.c | 121 +--
+ arch/mn10300/Kconfig | 1 +
+ arch/mn10300/include/asm/module.h | 7 +-
+ arch/openrisc/Kconfig | 1 +
+ arch/parisc/Kconfig | 2 +
+ arch/parisc/include/asm/module.h | 16 +-
+ arch/powerpc/Kconfig | 2 +
+ arch/powerpc/include/asm/module.h | 7 +-
+ arch/s390/Kconfig | 2 +
+ arch/s390/include/asm/module.h | 18 +-
+ arch/score/Kconfig | 2 +
+ arch/score/include/asm/module.h | 6 +-
+ arch/score/kernel/module.c | 10 -
+ arch/sh/Kconfig | 2 +
+ arch/sh/include/asm/module.h | 14 +-
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/module.h | 24 -
+ arch/tile/Kconfig | 1 +
+ arch/unicore32/Kconfig | 1 +
+ arch/x86/Kconfig | 2 +
+ arch/x86/um/Kconfig | 2 +
+ arch/xtensa/include/asm/module.h | 9 +-
+ crypto/Kconfig | 1 +
+ crypto/Makefile | 1 +
+ crypto/asymmetric_keys/.gitignore | 1 +
+ crypto/asymmetric_keys/Kconfig | 38 +
+ crypto/asymmetric_keys/Makefile | 27 +
+ crypto/asymmetric_keys/asymmetric_keys.h | 15 +
+ crypto/asymmetric_keys/asymmetric_type.c | 274 +++++
+ crypto/asymmetric_keys/public_key.c | 108 ++
+ crypto/asymmetric_keys/public_key.h | 30 +
+ crypto/asymmetric_keys/rsa.c | 277 ++++++
+ crypto/asymmetric_keys/signature.c | 49 +
+ crypto/asymmetric_keys/x509.asn1 | 60 ++
+ crypto/asymmetric_keys/x509_cert_parser.c | 496 +++++++++
+ crypto/asymmetric_keys/x509_parser.h | 36 +
+ crypto/asymmetric_keys/x509_public_key.c | 239 +++++
+ crypto/asymmetric_keys/x509_rsakey.asn1 | 4 +
+ fs/cifs/cifs_spnego.c | 6 +-
+ fs/cifs/cifsacl.c | 8 +-
+ include/asm-generic/bitops/count_zeros.h | 57 ++
+ include/asm-generic/module.h | 40 +-
+ include/crypto/public_key.h | 108 ++
+ include/keys/asymmetric-parser.h | 37 +
+ include/keys/asymmetric-subtype.h | 55 +
+ include/keys/asymmetric-type.h | 25 +
+ include/keys/user-type.h | 6 +-
+ include/linux/asn1.h | 67 ++
+ include/linux/asn1_ber_bytecode.h | 87 ++
+ include/linux/asn1_decoder.h | 24 +
+ include/linux/key-type.h | 35 +-
+ include/linux/module.h | 8 +
+ include/linux/moduleloader.h | 36 +-
+ include/linux/mpi.h | 1 +
+ include/linux/oid_registry.h | 92 ++
+ init/Kconfig | 68 ++
+ kernel/Makefile | 77 ++
+ kernel/modsign_pubkey.c | 113 +++
+ kernel/module-internal.h | 15 +
+ kernel/module.c | 157 ++-
+ kernel/module_signing.c | 243 +++++
+ lib/.gitignore | 2 +-
+ lib/Kconfig | 5 +
+ lib/Makefile | 18 +
+ lib/asn1_decoder.c | 487 +++++++++
+ lib/build_OID_registry | 209 ++++
+ lib/mpi/Makefile | 1 +
+ lib/mpi/longlong.h | 138 +--
+ lib/mpi/mpi-bit.c | 2 +-
+ lib/mpi/mpi-cmp.c | 70 ++
+ lib/mpi/mpi-pow.c | 4 +-
+ lib/mpi/mpicoder.c | 55 +
+ lib/oid_registry.c | 170 ++++
+ net/ceph/crypto.c | 9 +-
+ net/dns_resolver/dns_key.c | 6 +-
+ net/rxrpc/ar-key.c | 40 +-
+ scripts/.gitignore | 1 +
+ scripts/Makefile | 2 +
+ scripts/Makefile.build | 11 +
+ scripts/Makefile.modpost | 77 +-
+ scripts/asn1_compiler.c | 1545 +++++++++++++++++++++++++++++
+ scripts/sign-file | 115 +++
+ scripts/x509keyid | 268 +++++
+ security/keys/encrypted-keys/encrypted.c | 16 +-
+ security/keys/key.c | 114 ++-
+ security/keys/keyctl.c | 18 +-
+ security/keys/keyring.c | 6 +-
+ security/keys/request_key_auth.c | 8 +-
+ security/keys/trusted.c | 16 +-
+ security/keys/user_defined.c | 14 +-
+ 128 files changed, 6799 insertions(+), 594 deletions(-)
+ create mode 100644 Documentation/crypto/asymmetric-keys.txt
+ delete mode 100644 arch/cris/include/asm/module.h
+ delete mode 100644 arch/h8300/include/asm/module.h
+ delete mode 100644 arch/m32r/include/asm/module.h
+ create mode 100644 arch/mips/kernel/module-rela.c
+ delete mode 100644 arch/sparc/include/asm/module.h
+ create mode 100644 crypto/asymmetric_keys/.gitignore
+ create mode 100644 crypto/asymmetric_keys/Kconfig
+ create mode 100644 crypto/asymmetric_keys/Makefile
+ create mode 100644 crypto/asymmetric_keys/asymmetric_keys.h
+ create mode 100644 crypto/asymmetric_keys/asymmetric_type.c
+ create mode 100644 crypto/asymmetric_keys/public_key.c
+ create mode 100644 crypto/asymmetric_keys/public_key.h
+ create mode 100644 crypto/asymmetric_keys/rsa.c
+ create mode 100644 crypto/asymmetric_keys/signature.c
+ create mode 100644 crypto/asymmetric_keys/x509.asn1
+ create mode 100644 crypto/asymmetric_keys/x509_cert_parser.c
+ create mode 100644 crypto/asymmetric_keys/x509_parser.h
+ create mode 100644 crypto/asymmetric_keys/x509_public_key.c
+ create mode 100644 crypto/asymmetric_keys/x509_rsakey.asn1
+ create mode 100644 include/asm-generic/bitops/count_zeros.h
+ create mode 100644 include/crypto/public_key.h
+ create mode 100644 include/keys/asymmetric-parser.h
+ create mode 100644 include/keys/asymmetric-subtype.h
+ create mode 100644 include/keys/asymmetric-type.h
+ create mode 100644 include/linux/asn1.h
+ create mode 100644 include/linux/asn1_ber_bytecode.h
+ create mode 100644 include/linux/asn1_decoder.h
+ create mode 100644 include/linux/oid_registry.h
+ create mode 100644 kernel/modsign_pubkey.c
+ create mode 100644 kernel/module-internal.h
+ create mode 100644 kernel/module_signing.c
+ create mode 100644 lib/asn1_decoder.c
+ create mode 100755 lib/build_OID_registry
+ create mode 100644 lib/mpi/mpi-cmp.c
+ create mode 100644 lib/oid_registry.c
+ create mode 100644 scripts/asn1_compiler.c
+ create mode 100644 scripts/sign-file
+ create mode 100755 scripts/x509keyid
+Merging virtio/virtio-next (ca16f58 lguest: fix occasional crash in example launcher.)
+$ git merge virtio/virtio-next
+Already up-to-date.
+Merging input/next (aba828c Input: samsung-keypad - add clk_prepare and clk_unprepare)
+$ git merge input/next
+Auto-merging drivers/input/tablet/wacom_wac.c
+Merge made by the 'recursive' strategy.
+ drivers/input/keyboard/samsung-keypad.c | 11 ++-
+ drivers/input/tablet/wacom_sys.c | 145 ++++++++++++++++++++++--------
+ drivers/input/tablet/wacom_wac.c | 30 +++++--
+ drivers/input/touchscreen/atmel_mxt_ts.c | 6 +-
+ 4 files changed, 142 insertions(+), 50 deletions(-)
+Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (c0a93e2 Merge branch 'for-3.7-hierarchy' into for-next)
+$ git merge cgroup/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
+$ git merge block/for-next
+Resolved 'init/Kconfig' using previous resolution.
+Auto-merging lib/scatterlist.c
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging include/linux/fs.h
+Auto-merging drivers/target/target_core_iblock.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/block/mtip32xx/mtip32xx.h
+Auto-merging drivers/block/mtip32xx/mtip32xx.c
+Auto-merging drivers/block/loop.c
+Auto-merging drivers/block/floppy.c
+Auto-merging drivers/block/Kconfig
+Auto-merging block/ioctl.c
+Auto-merging block/genhd.c
+Auto-merging block/blk-core.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 792d5c5] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-block | 14 +
+ Documentation/block/biodoc.txt | 5 -
+ Documentation/percpu-rw-semaphore.txt | 27 +
+ MAINTAINERS | 7 +-
+ block/blk-core.c | 51 +-
+ block/blk-lib.c | 104 +-
+ block/blk-merge.c | 53 +-
+ block/blk-settings.c | 16 +
+ block/blk-sysfs.c | 44 +-
+ block/blk-tag.c | 6 +-
+ block/blk.h | 5 +-
+ block/elevator.c | 6 +-
+ block/genhd.c | 6 +-
+ block/ioctl.c | 27 +
+ drivers/block/Kconfig | 1 +
+ drivers/block/cciss.c | 1 -
+ drivers/block/drbd/drbd_main.c | 13 +-
+ drivers/block/floppy.c | 97 +-
+ drivers/block/loop.c | 17 +-
+ drivers/block/mtip32xx/mtip32xx.c | 19 +-
+ drivers/block/mtip32xx/mtip32xx.h | 3 +
+ drivers/block/osdblk.c | 3 +-
+ drivers/block/pktcdvd.c | 52 +-
+ drivers/block/xen-blkback/common.h | 4 +-
+ drivers/block/xen-blkback/xenbus.c | 9 +-
+ drivers/char/raw.c | 2 +-
+ drivers/md/dm-crypt.c | 16 +-
+ drivers/md/dm-io.c | 11 -
+ drivers/md/dm.c | 74 +-
+ drivers/md/md.c | 44 +-
+ drivers/md/raid0.c | 1 +
+ drivers/memstick/core/Kconfig | 12 +
+ drivers/memstick/core/Makefile | 2 +-
+ drivers/memstick/core/ms_block.c | 2395 +++++++++++++++++++++++++++++++++
+ drivers/memstick/core/ms_block.h | 293 ++++
+ drivers/target/target_core_iblock.c | 9 -
+ fs/bio-integrity.c | 44 +-
+ fs/bio.c | 231 ++--
+ fs/block_dev.c | 69 +-
+ fs/exofs/ore.c | 5 +-
+ include/linux/bio.h | 70 +-
+ include/linux/blk_types.h | 36 +-
+ include/linux/blkdev.h | 82 +-
+ include/linux/fs.h | 6 +
+ include/linux/percpu-rwsem.h | 89 ++
+ include/linux/scatterlist.h | 1 +
+ lib/scatterlist.c | 19 +
+ 47 files changed, 3568 insertions(+), 533 deletions(-)
+ create mode 100644 Documentation/percpu-rw-semaphore.txt
+ create mode 100644 drivers/memstick/core/ms_block.c
+ create mode 100644 drivers/memstick/core/ms_block.h
+ create mode 100644 include/linux/percpu-rwsem.h
+Merging quilt/device-mapper (1ca30da Use the recently-added bio front_pad field to allocate struct dm_target_io.)
+$ git merge quilt/device-mapper
+Resolved 'drivers/md/dm-thin.c' using previous resolution.
+Resolved 'drivers/md/dm.c' using previous resolution.
+Auto-merging drivers/md/dm.c
+CONFLICT (content): Merge conflict in drivers/md/dm.c
+Auto-merging drivers/md/dm-verity.c
+Auto-merging drivers/md/dm-thin.c
+CONFLICT (content): Merge conflict in drivers/md/dm-thin.c
+Auto-merging drivers/md/dm-mpath.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7d66f7b] Merge branch 'quilt/device-mapper'
+$ git diff -M --stat --summary HEAD^..
+ drivers/md/Kconfig | 7 +
+ drivers/md/Makefile | 1 +
+ drivers/md/dm-bio-prison.c | 415 +++++++++++++++++
+ drivers/md/dm-bio-prison.h | 72 +++
+ drivers/md/dm-bufio.c | 13 +-
+ drivers/md/dm-mpath.c | 3 +-
+ drivers/md/dm-thin.c | 514 ++++------------------
+ drivers/md/dm-verity.c | 2 +-
+ drivers/md/dm.c | 80 ++--
+ drivers/md/persistent-data/dm-space-map-common.c | 4 +-
+ 10 files changed, 618 insertions(+), 493 deletions(-)
+ create mode 100644 drivers/md/dm-bio-prison.c
+ create mode 100644 drivers/md/dm-bio-prison.h
+Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (a1487fb mmc: rtsx_pci_sdmmc: Add realtek pcie sdmmc host driver)
+$ git merge mmc/mmc-next
+Resolved 'drivers/mmc/host/davinci_mmc.c' using previous resolution.
+Resolved 'drivers/mmc/host/omap.c' using previous resolution.
+Auto-merging drivers/mmc/host/vub300.c
+Auto-merging drivers/mmc/host/sdhci-tegra.c
+Auto-merging drivers/mmc/host/sdhci-pci.c
+Auto-merging drivers/mmc/host/pxamci.c
+Auto-merging drivers/mmc/host/omap_hsmmc.c
+Auto-merging drivers/mmc/host/omap.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/omap.c
+Auto-merging drivers/mmc/host/mxcmmc.c
+Auto-merging drivers/mmc/host/davinci_mmc.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
+Auto-merging drivers/mmc/host/atmel-mci.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a8ec749] Merge remote-tracking branch 'mmc/mmc-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mmc/atmel-hsmci.txt | 68 +
+ .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 87 ++
+ Documentation/devicetree/bindings/mmc/mmc.txt | 9 +-
+ Documentation/devicetree/bindings/mmc/pxa-mmc.txt | 25 +
+ .../devicetree/bindings/mmc/samsung-sdhci.txt | 53 +
+ .../devicetree/bindings/mmc/sdhci-dove.txt | 14 +
+ .../devicetree/bindings/mmc/sdhci-spear.txt | 18 +
+ .../devicetree/bindings/mmc/synposis-dw-mshc.txt | 79 ++
+ MAINTAINERS | 6 +-
+ arch/arm/boot/dts/spear300-evb.dts | 3 +-
+ arch/arm/boot/dts/spear320-evb.dts | 2 -
+ drivers/mmc/core/core.c | 240 ++--
+ drivers/mmc/core/debugfs.c | 2 +-
+ drivers/mmc/core/mmc.c | 57 +-
+ drivers/mmc/core/mmc_ops.c | 84 +-
+ drivers/mmc/core/sdio_bus.c | 7 -
+ drivers/mmc/core/slot-gpio.c | 8 +-
+ drivers/mmc/host/Kconfig | 16 +
+ drivers/mmc/host/Makefile | 2 +
+ drivers/mmc/host/atmel-mci-regs.h | 7 +
+ drivers/mmc/host/atmel-mci.c | 113 +-
+ drivers/mmc/host/bfin_sdh.c | 210 +--
+ drivers/mmc/host/dw_mmc-exynos.c | 253 ++++
+ drivers/mmc/host/dw_mmc-pci.c | 15 +-
+ drivers/mmc/host/dw_mmc-pltfm.c | 62 +-
+ drivers/mmc/host/dw_mmc-pltfm.h | 20 +
+ drivers/mmc/host/dw_mmc.c | 326 ++++-
+ drivers/mmc/host/dw_mmc.h | 24 +
+ drivers/mmc/host/mmc_spi.c | 15 +-
+ drivers/mmc/host/mmci.c | 13 +-
+ drivers/mmc/host/mxcmmc.c | 76 +-
+ drivers/mmc/host/omap.c | 37 +-
+ drivers/mmc/host/omap_hsmmc.c | 125 +-
+ drivers/mmc/host/pxamci.c | 52 +
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 ++++++++++++++++++++
+ drivers/mmc/host/sdhci-dove.c | 8 +
+ drivers/mmc/host/sdhci-of-esdhc.c | 36 +-
+ drivers/mmc/host/sdhci-pci.c | 19 +-
+ drivers/mmc/host/sdhci-pltfm.c | 3 +
+ drivers/mmc/host/sdhci-pxav2.c | 6 +-
+ drivers/mmc/host/sdhci-pxav3.c | 35 +-
+ drivers/mmc/host/sdhci-s3c.c | 216 +++-
+ drivers/mmc/host/sdhci-spear.c | 67 +-
+ drivers/mmc/host/sdhci-tegra.c | 7 +-
+ drivers/mmc/host/sdhci.c | 205 +--
+ drivers/mmc/host/sh_mmcif.c | 8 +-
+ drivers/mmc/host/via-sdmmc.c | 16 +-
+ drivers/mmc/host/vub300.c | 4 +-
+ include/linux/mmc/card.h | 18 +-
+ include/linux/mmc/core.h | 4 +
+ include/linux/mmc/dw_mmc.h | 15 +-
+ include/linux/mmc/host.h | 5 +-
+ include/linux/mmc/mmc.h | 19 +
+ include/linux/mmc/sdhci.h | 3 +-
+ include/linux/platform_data/pxa_sdhci.h | 1 +
+ 55 files changed, 3535 insertions(+), 620 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/pxa-mmc.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-spear.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt
+ create mode 100644 drivers/mmc/host/dw_mmc-exynos.c
+ create mode 100644 drivers/mmc/host/dw_mmc-pltfm.h
+ create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
+Merging kgdb/kgdb-next (08f9553 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
+$ git merge kgdb/kgdb-next
+Auto-merging drivers/tty/serial/kgdboc.c
+Merge made by the 'recursive' strategy.
+ arch/mips/kernel/kgdb.c | 9 +++++++++
+ arch/x86/kernel/kgdb.c | 2 ++
+ drivers/tty/serial/kgdboc.c | 3 ++-
+ include/linux/console.h | 10 ++++++++--
+ 4 files changed, 21 insertions(+), 3 deletions(-)
+Merging slab/for-next (e2087be Merge branch 'slab/tracing' into slab/for-linus)
+$ git merge slab/for-next
+Already up-to-date.
+Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (c0c6d3f md: writing to sync_action should clear the read-auto state.)
+$ git merge md/for-next
+Resolved 'drivers/md/raid0.c' using previous resolution.
+Resolved 'fs/bio.c' using previous resolution.
+Auto-merging fs/bio.c
+CONFLICT (content): Merge conflict in fs/bio.c
+Auto-merging drivers/md/raid0.c
+CONFLICT (content): Merge conflict in drivers/md/raid0.c
+Auto-merging drivers/md/md.c
+Auto-merging block/blk-core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8e3f0f7] Merge remote-tracking branch 'md/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/device-mapper/dm-raid.txt | 9 +
+ block/blk-core.c | 1 +
+ crypto/xor.c | 4 +-
+ drivers/md/bitmap.c | 17 +-
+ drivers/md/dm-raid.c | 124 ++++--
+ drivers/md/linear.c | 25 +-
+ drivers/md/md.c | 148 +++++--
+ drivers/md/md.h | 17 +-
+ drivers/md/multipath.c | 3 +-
+ drivers/md/raid0.c | 19 +-
+ drivers/md/raid1.c | 34 +-
+ drivers/md/raid10.c | 91 ++++-
+ drivers/md/raid5.c | 664 ++++++++++++++++++++++++++++---
+ drivers/md/raid5.h | 20 +
+ 14 files changed, 1022 insertions(+), 154 deletions(-)
+Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic)
+$ git merge mfd/for-next
+Already up-to-date.
+Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
+$ git merge battery/master
+Already up-to-date.
+Merging fbdev/fbdev-next (ebe9f7b video: exynos_mipi_dsi: Remove unnecessary NULL check)
+$ git merge fbdev/fbdev-next
+Resolved 'arch/arm/mach-s3c64xx/mach-mini6410.c' using previous resolution.
+Resolved 'arch/arm/mach-s3c64xx/mach-real6410.c' using previous resolution.
+Resolved 'drivers/video/msm/mddi.c' using previous resolution.
+Resolved 'drivers/video/msm/mdp.c' using previous resolution.
+Auto-merging include/video/samsung_fimd.h
+Auto-merging drivers/video/ps3fb.c
+Removing drivers/video/pnx4008/sdum.h
+Removing drivers/video/pnx4008/sdum.c
+Removing drivers/video/pnx4008/pnxrgbfb.c
+Removing drivers/video/pnx4008/fbcommon.h
+Removing drivers/video/pnx4008/dum.h
+Removing drivers/video/pnx4008/Makefile
+Auto-merging drivers/video/msm/mdp_hw.h
+CONFLICT (content): Merge conflict in drivers/video/msm/mdp_hw.h
+Auto-merging drivers/video/msm/mdp.c
+CONFLICT (content): Merge conflict in drivers/video/msm/mdp.c
+Auto-merging drivers/video/msm/mddi_client_nt35399.c
+Auto-merging drivers/video/msm/mddi.c
+CONFLICT (content): Merge conflict in drivers/video/msm/mddi.c
+Auto-merging drivers/video/jz4740_fb.c
+Auto-merging drivers/video/imxfb.c
+Auto-merging drivers/video/exynos/exynos_mipi_dsi.c
+CONFLICT (modify/delete): drivers/video/epson1355fb.c deleted in HEAD and modified in fbdev/fbdev-next. Version fbdev/fbdev-next of drivers/video/epson1355fb.c left in tree.
+Auto-merging drivers/video/ep93xx-fb.c
+Auto-merging drivers/video/da8xx-fb.c
+Auto-merging drivers/video/Makefile
+Auto-merging drivers/video/Kconfig
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_fimd.c
+Removing arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c
+Auto-merging arch/arm/mach-s5pv210/mach-goni.c
+Auto-merging arch/arm/mach-s5pc100/mach-smdkc100.c
+Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
+Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
+Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
+CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-real6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-ncp.c
+Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
+CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-mini6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
+Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-anw6410.c
+Auto-merging arch/arm/mach-s3c24xx/mach-smdk2416.c
+Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
+Auto-merging arch/arm/mach-exynos/mach-smdkv310.c
+Auto-merging arch/arm/mach-exynos/mach-smdk4x12.c
+Auto-merging arch/arm/mach-exynos/mach-origen.c
+Auto-merging arch/arm/mach-exynos/mach-nuri.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/video/epson1355fb.c
+drivers/video/epson1355fb.c: needs merge
+rm 'drivers/video/epson1355fb.c'
+$ git commit -v -a
+Recorded resolution for 'drivers/video/msm/mdp_hw.h'.
+[master 505ac96] Merge remote-tracking branch 'fbdev/fbdev-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-exynos/mach-nuri.c | 2 +-
+ arch/arm/mach-exynos/mach-origen.c | 2 +-
+ arch/arm/mach-exynos/mach-smdk4x12.c | 2 +-
+ arch/arm/mach-exynos/mach-smdkv310.c | 2 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
+ arch/arm/mach-exynos/setup-fimd0.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +-
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +-
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +-
+ arch/arm/mach-s5pv210/mach-aquila.c | 2 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 2 +-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
+ arch/arm/plat-samsung/include/plat/regs-fb-v4.h | 159 ----
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
+ drivers/video/Kconfig | 15 -
+ drivers/video/Makefile | 2 -
+ drivers/video/amifb.c | 2 -
+ drivers/video/arcfb.c | 1 +
+ drivers/video/atmel_lcdfb.c | 5 +-
+ drivers/video/bf537-lq035.c | 12 +-
+ drivers/video/bf54x-lq043fb.c | 9 +-
+ drivers/video/bfin-lq035q1-fb.c | 13 +-
+ drivers/video/bfin-t350mcqb-fb.c | 1 +
+ drivers/video/bw2.c | 4 +-
+ drivers/video/cg3.c | 3 +-
+ drivers/video/cobalt_lcdfb.c | 5 +-
+ drivers/video/console/font_mini_4x6.c | 2 +-
+ drivers/video/console/font_sun8x16.c | 2 +-
+ drivers/video/cyber2000fb.c | 4 +-
+ drivers/video/da8xx-fb.c | 191 +++--
+ drivers/video/ep93xx-fb.c | 17 +-
+ drivers/video/exynos/exynos_dp_core.c | 314 ++++---
+ drivers/video/exynos/exynos_dp_core.h | 6 +-
+ drivers/video/exynos/exynos_dp_reg.c | 58 +-
+ drivers/video/exynos/exynos_dp_reg.h | 3 +-
+ drivers/video/exynos/exynos_mipi_dsi.c | 6 +-
+ drivers/video/exynos/exynos_mipi_dsi_common.c | 8 -
+ drivers/video/fsl-diu-fb.c | 10 +-
+ drivers/video/gbefb.c | 15 +-
+ drivers/video/hpfb.c | 28 +-
+ drivers/video/imxfb.c | 1 +
+ drivers/video/jz4740_fb.c | 44 +-
+ drivers/video/mb862xx/mb862xxfbdrv.c | 10 +-
+ drivers/video/mbx/mbxfb.c | 25 +-
+ drivers/video/msm/mddi.c | 3 -
+ drivers/video/msm/mddi_client_nt35399.c | 6 +-
+ drivers/video/msm/mdp.c | 1 -
+ drivers/video/msm/mdp_hw.h | 1 -
+ drivers/video/pnx4008/Makefile | 7 -
+ drivers/video/pnx4008/dum.h | 211 -----
+ drivers/video/pnx4008/fbcommon.h | 43 -
+ drivers/video/pnx4008/pnxrgbfb.c | 198 -----
+ drivers/video/pnx4008/sdum.c | 861 --------------------
+ drivers/video/pnx4008/sdum.h | 136 ----
+ drivers/video/ps3fb.c | 7 +-
+ drivers/video/s3c-fb.c | 26 +-
+ drivers/video/s3c2410fb.c | 34 +-
+ drivers/video/sis/initextlfb.c | 2 +-
+ drivers/video/sunxvr1000.c | 4 +-
+ drivers/video/sunxvr2500.c | 4 +-
+ drivers/video/sunxvr500.c | 8 +-
+ drivers/video/uvesafb.c | 2 +
+ drivers/video/vermilion/vermilion.c | 3 +-
+ drivers/video/via/via_clock.c | 19 +
+ .../plat/regs-fb.h => include/video/samsung_fimd.h | 152 +++-
+ 75 files changed, 665 insertions(+), 2084 deletions(-)
+ delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+ delete mode 100644 drivers/video/pnx4008/Makefile
+ delete mode 100644 drivers/video/pnx4008/dum.h
+ delete mode 100644 drivers/video/pnx4008/fbcommon.h
+ delete mode 100644 drivers/video/pnx4008/pnxrgbfb.c
+ delete mode 100644 drivers/video/pnx4008/sdum.c
+ delete mode 100644 drivers/video/pnx4008/sdum.h
+ rename arch/arm/plat-samsung/include/plat/regs-fb.h => include/video/samsung_fimd.h (73%)
+Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
+$ git merge omap_dss2/for-next
+Resolved 'drivers/video/omap/lcd_ams_delta.c' using previous resolution.
+Resolved 'drivers/video/omap2/displays/panel-taal.c' using previous resolution.
+Resolved 'drivers/video/omap2/dss/dispc.c' using previous resolution.
+Auto-merging drivers/video/omap2/omapfb/omapfb-main.c
+Auto-merging drivers/video/omap2/dss/dsi.c
+Auto-merging drivers/video/omap2/dss/dispc.c
+CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c
+Auto-merging drivers/video/omap2/displays/panel-taal.c
+CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c
+Auto-merging drivers/video/omap/lcd_ams_delta.c
+CONFLICT (content): Merge conflict in drivers/video/omap/lcd_ams_delta.c
+Auto-merging drivers/staging/omapdrm/omap_drv.c
+Auto-merging drivers/media/platform/omap/omap_vout.c
+Auto-merging arch/arm/mach-omap2/twl-common.c
+Auto-merging arch/arm/mach-omap2/display.c
+Auto-merging arch/arm/mach-omap2/board-omap4panda.c
+Auto-merging arch/arm/mach-omap2/board-4430sdp.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7869977] Merge remote-tracking branch 'omap_dss2/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-omap2/board-4430sdp.c | 73 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 27 +-
+ arch/arm/mach-omap2/display.c | 1 -
+ arch/arm/mach-omap2/twl-common.c | 6 +
+ drivers/media/platform/omap/omap_vout.c | 75 +-
+ drivers/staging/omapdrm/omap_drv.c | 5 +-
+ drivers/video/omap/hwa742.c | 1 -
+ drivers/video/omap/lcd_palmte.c | 1 -
+ drivers/video/omap/omapfb_main.c | 9 -
+ drivers/video/omap2/displays/panel-acx565akm.c | 14 +-
+ drivers/video/omap2/displays/panel-generic-dpi.c | 76 +-
+ .../omap2/displays/panel-lgphilips-lb035q02.c | 3 +
+ drivers/video/omap2/displays/panel-n8x0.c | 31 +-
+ .../omap2/displays/panel-nec-nl8048hl11-01b.c | 3 +
+ drivers/video/omap2/displays/panel-picodlp.c | 4 +
+ .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 3 +
+ drivers/video/omap2/displays/panel-taal.c | 239 ++---
+ drivers/video/omap2/displays/panel-tfp410.c | 20 +-
+ .../video/omap2/displays/panel-tpo-td043mtea1.c | 7 +-
+ drivers/video/omap2/dss/Kconfig | 2 +-
+ drivers/video/omap2/dss/Makefile | 4 +-
+ drivers/video/omap2/dss/apply.c | 330 ++-----
+ drivers/video/omap2/dss/core.c | 91 +-
+ drivers/video/omap2/dss/dispc.c | 1018 ++++++++++++++------
+ drivers/video/omap2/dss/dispc.h | 37 +
+ drivers/video/omap2/dss/display.c | 108 ++-
+ drivers/video/omap2/dss/dpi.c | 181 +++-
+ drivers/video/omap2/dss/dsi.c | 675 ++++++++++---
+ drivers/video/omap2/dss/dss.c | 257 +++--
+ drivers/video/omap2/dss/dss.h | 79 +-
+ drivers/video/omap2/dss/dss_features.c | 278 +++++-
+ drivers/video/omap2/dss/dss_features.h | 7 +
+ drivers/video/omap2/dss/hdmi.c | 247 +++--
+ drivers/video/omap2/dss/hdmi_panel.c | 31 +-
+ drivers/video/omap2/dss/manager-sysfs.c | 512 ++++++++++
+ drivers/video/omap2/dss/manager.c | 473 +--------
+ drivers/video/omap2/dss/output.c | 148 +++
+ drivers/video/omap2/dss/overlay-sysfs.c | 456 +++++++++
+ drivers/video/omap2/dss/overlay.c | 492 +---------
+ drivers/video/omap2/dss/rfbi.c | 222 +++--
+ drivers/video/omap2/dss/sdi.c | 126 ++-
+ drivers/video/omap2/dss/venc.c | 337 +++----
+ drivers/video/omap2/dss/venc_panel.c | 251 +++++
+ drivers/video/omap2/omapfb/omapfb-ioctl.c | 7 +-
+ drivers/video/omap2/omapfb/omapfb-main.c | 32 +-
+ drivers/video/omap2/omapfb/omapfb.h | 5 +-
+ drivers/video/omap2/vram.c | 56 --
+ include/video/omapdss.h | 112 ++-
+ 48 files changed, 4575 insertions(+), 2597 deletions(-)
+ create mode 100644 drivers/video/omap2/dss/manager-sysfs.c
+ create mode 100644 drivers/video/omap2/dss/output.c
+ create mode 100644 drivers/video/omap2/dss/overlay-sysfs.c
+ create mode 100644 drivers/video/omap2/dss/venc_panel.c
+Merging regulator/for-next (6a2027a Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next)
+$ git merge regulator/for-next
+Already up-to-date.
+Merging security/next (bf53083 Merge tag 'v3.6-rc7' into next)
+$ git merge security/next
+Already up-to-date.
+Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
+$ git merge selinux/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/davinci_wdt.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (0094872 Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging vfio/next (f448d31 vfio: Fix PCI INTx disable consistency)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci_intrs.c | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+Merging osd/linux-next (7f8d145 pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h)
+$ git merge osd/linux-next
+Merge made by the 'recursive' strategy.
+ fs/exofs/ore_raid.c | 2 +-
+ fs/exofs/sys.c | 7 ++++++-
+ include/linux/pnfs_osd_xdr.h | 1 -
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+Merging jc_docs/docs-next (5c050fb docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (9c33c51 doc: fix old config name of kprobetrace)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next (df5a2a1 Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394)
+$ git merge pm/linux-next
+Already up-to-date.
+Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
+$ git merge apm/for-next
+Already up-to-date.
+Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Resolved 'kernel/audit_tree.c' using previous resolution.
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit_tree.c
+CONFLICT (content): Merge conflict in kernel/audit_tree.c
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging fs/notify/notification.c
+Auto-merging fs/notify/inotify/inotify_user.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fde3830] Merge remote-tracking branch 'fsnotify/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/notify/dnotify/dnotify.c | 4 +-
+ fs/notify/fanotify/fanotify.c | 6 +++
+ fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
+ fs/notify/group.c | 47 ++++++++++--------
+ fs/notify/inode_mark.c | 14 ++++--
+ fs/notify/inotify/inotify_fsnotify.c | 4 +-
+ fs/notify/inotify/inotify_user.c | 34 ++++++-------
+ fs/notify/mark.c | 91 +++++++++++++++++++---------------
+ fs/notify/notification.c | 1 +
+ fs/notify/vfsmount_mark.c | 14 ++++--
+ include/linux/fsnotify_backend.h | 31 ++++++++----
+ kernel/audit_tree.c | 10 ++--
+ kernel/audit_watch.c | 4 +-
+ 13 files changed, 178 insertions(+), 119 deletions(-)
+Merging edac/linux_next (cfe5031 edac: edac_mc no longer deals with kobjects directly)
+$ git merge edac/linux_next
+Auto-merging drivers/edac/edac_mc.c
+Merge made by the 'recursive' strategy.
+ drivers/edac/edac_mc.c | 7 -------
+ include/linux/edac.h | 1 -
+ 2 files changed, 8 deletions(-)
+Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
+$ git merge edac-amd/for-next
+Resolved 'Documentation/edac.txt' using previous resolution.
+Resolved 'drivers/edac/amd64_edac.c' using previous resolution.
+Auto-merging drivers/edac/amd64_edac.c
+CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
+Auto-merging Documentation/edac.txt
+CONFLICT (content): Merge conflict in Documentation/edac.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bf15e41] Merge remote-tracking branch 'edac-amd/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (36165f5 MAINTAINERS: add scripts/dtc under Devicetree maintainers)
+$ git merge dt-rh/for-next
+Already up-to-date.
+Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
+$ git merge spi/spi/next
+Already up-to-date.
+Merging spi-mb/spi-next (43e37b0 spi: tsc2005: delete soon-obsolete e-mail address)
+$ git merge spi-mb/spi-next
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-rspi.c | 56 ++++++++++++++++++++++++++-----------------
+ include/linux/spi/tsc2005.h | 2 --
+ 2 files changed, 34 insertions(+), 24 deletions(-)
+Merging tip/auto-latest (6b90cb2 Merge branch 'sched/urgent')
+$ git merge tip/auto-latest
+Auto-merging tools/perf/Makefile
+Auto-merging scripts/kconfig/Makefile
+Auto-merging mm/vmstat.c
+Auto-merging lib/Makefile
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/events/core.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/init_task.h
+Auto-merging include/linux/acpi.h
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/include/asm/pgtable.h
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/acpi/initrd_table_override.txt | 94 ++
+ MAINTAINERS | 8 +
+ arch/sh/mm/Kconfig | 1 +
+ arch/x86/Kconfig | 31 +
+ arch/x86/include/asm/msr-index.h | 5 +
+ arch/x86/include/asm/pgtable.h | 1 +
+ arch/x86/kernel/acpi/boot.c | 6 +
+ arch/x86/kernel/cpu/Makefile | 2 +-
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
+ arch/x86/kernel/cpu/perf_event.h | 2 +
+ arch/x86/kernel/cpu/perf_event_amd_ibs.c | 61 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 2 +
+ arch/x86/kernel/cpu/perf_event_knc.c | 248 +++++
+ arch/x86/kernel/cpu/perfctr-watchdog.c | 4 +
+ arch/x86/kernel/reboot.c | 8 -
+ arch/x86/kernel/setup.c | 4 +
+ arch/x86/realmode/rm/wakeup_asm.S | 15 +-
+ drivers/acpi/Kconfig | 9 +
+ drivers/acpi/osl.c | 202 +++-
+ drivers/base/node.c | 2 +-
+ include/linux/acpi.h | 16 +
+ include/linux/earlycpio.h | 17 +
+ include/linux/huge_mm.h | 19 +
+ include/linux/init_task.h | 9 +
+ include/linux/mempolicy.h | 30 +-
+ include/linux/migrate.h | 7 +
+ include/linux/migrate_mode.h | 3 +
+ include/linux/mm.h | 115 +-
+ include/linux/mm_types.h | 34 +
+ include/linux/mmzone.h | 15 +-
+ include/linux/page-flags-layout.h | 83 ++
+ include/linux/perf_event.h | 2 +-
+ include/linux/sched.h | 27 +-
+ init/Kconfig | 11 +
+ kernel/events/core.c | 21 +-
+ kernel/sched/core.c | 142 ++-
+ kernel/sched/debug.c | 3 +
+ kernel/sched/fair.c | 545 ++++++++-
+ kernel/sched/features.h | 10 +
+ kernel/sched/sched.h | 37 +
+ kernel/sysctl.c | 13 +-
+ kernel/time/tick-sched.c | 2 +-
+ lib/Makefile | 2 +-
+ lib/earlycpio.c | 145 +++
+ mm/huge_memory.c | 174 ++-
+ mm/memory.c | 105 +-
+ mm/mempolicy.c | 298 +++--
+ mm/migrate.c | 85 +-
+ mm/mprotect.c | 31 +-
+ mm/vmstat.c | 1 -
+ scripts/kconfig/Makefile | 7 +-
+ tools/kvm/.gitignore | 12 +
+ tools/kvm/CREDITS-Git | 30 +
+ tools/kvm/Documentation/kernel-debugging.txt | 15 +
+ tools/kvm/Documentation/kvm-balloon.txt | 24 +
+ tools/kvm/Documentation/kvm-debug.txt | 16 +
+ tools/kvm/Documentation/kvm-list.txt | 16 +
+ tools/kvm/Documentation/kvm-pause.txt | 16 +
+ tools/kvm/Documentation/kvm-resume.txt | 16 +
+ tools/kvm/Documentation/kvm-run.txt | 62 ++
+ tools/kvm/Documentation/kvm-sandbox.txt | 16 +
+ tools/kvm/Documentation/kvm-setup.txt | 15 +
+ tools/kvm/Documentation/kvm-stat.txt | 19 +
+ tools/kvm/Documentation/kvm-stop.txt | 16 +
+ tools/kvm/Documentation/kvm-version.txt | 21 +
+ tools/kvm/Documentation/virtio-console.txt | 41 +
+ tools/kvm/Makefile | 457 ++++++++
+ tools/kvm/README | 112 ++
+ tools/kvm/builtin-balloon.c | 80 ++
+ tools/kvm/builtin-debug.c | 110 ++
+ tools/kvm/builtin-help.c | 63 ++
+ tools/kvm/builtin-list.c | 149 +++
+ tools/kvm/builtin-pause.c | 88 ++
+ tools/kvm/builtin-resume.c | 88 ++
+ tools/kvm/builtin-run.c | 697 ++++++++++++
+ tools/kvm/builtin-sandbox.c | 9 +
+ tools/kvm/builtin-setup.c | 262 +++++
+ tools/kvm/builtin-stat.c | 127 +++
+ tools/kvm/builtin-stop.c | 70 ++
+ tools/kvm/builtin-version.c | 15 +
+ tools/kvm/code16gcc.h | 15 +
+ tools/kvm/command-list.txt | 15 +
+ tools/kvm/config/feature-tests.mak | 177 +++
+ tools/kvm/config/utilities.mak | 196 ++++
+ tools/kvm/disk/blk.c | 76 ++
+ tools/kvm/disk/core.c | 354 ++++++
+ tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++++++++
+ tools/kvm/disk/raw.c | 141 +++
+ tools/kvm/framebuffer.c | 80 ++
+ tools/kvm/guest/init.c | 72 ++
+ tools/kvm/guest_compat.c | 99 ++
+ tools/kvm/hw/i8042.c | 355 ++++++
+ tools/kvm/hw/pci-shmem.c | 405 +++++++
+ tools/kvm/hw/rtc.c | 139 +++
+ tools/kvm/hw/serial.c | 452 ++++++++
+ tools/kvm/hw/vesa.c | 89 ++
+ tools/kvm/include/asm/hweight.h | 8 +
+ tools/kvm/include/bios/memcpy.h | 9 +
+ tools/kvm/include/kvm/8250-serial.h | 11 +
+ tools/kvm/include/kvm/apic.h | 17 +
+ tools/kvm/include/kvm/brlock.h | 41 +
+ tools/kvm/include/kvm/builtin-balloon.h | 9 +
+ tools/kvm/include/kvm/builtin-debug.h | 20 +
+ tools/kvm/include/kvm/builtin-help.h | 6 +
+ tools/kvm/include/kvm/builtin-list.h | 10 +
+ tools/kvm/include/kvm/builtin-pause.h | 9 +
+ tools/kvm/include/kvm/builtin-resume.h | 9 +
+ tools/kvm/include/kvm/builtin-run.h | 11 +
+ tools/kvm/include/kvm/builtin-sandbox.h | 6 +
+ tools/kvm/include/kvm/builtin-setup.h | 11 +
+ tools/kvm/include/kvm/builtin-stat.h | 9 +
+ tools/kvm/include/kvm/builtin-stop.h | 9 +
+ tools/kvm/include/kvm/builtin-version.h | 6 +
+ tools/kvm/include/kvm/compiler.h | 10 +
+ tools/kvm/include/kvm/disk-image.h | 96 ++
+ tools/kvm/include/kvm/e820.h | 13 +
+ tools/kvm/include/kvm/framebuffer.h | 36 +
+ tools/kvm/include/kvm/guest_compat.h | 9 +
+ tools/kvm/include/kvm/i8042.h | 12 +
+ tools/kvm/include/kvm/ioeventfd.h | 28 +
+ tools/kvm/include/kvm/ioport.h | 70 ++
+ tools/kvm/include/kvm/irq.h | 33 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-config.h | 60 +
+ tools/kvm/include/kvm/kvm-cpu.h | 26 +
+ tools/kvm/include/kvm/kvm-ipc.h | 26 +
+ tools/kvm/include/kvm/kvm.h | 121 ++
+ tools/kvm/include/kvm/msi.h | 10 +
+ tools/kvm/include/kvm/mutex.h | 33 +
+ tools/kvm/include/kvm/parse-options.h | 218 ++++
+ tools/kvm/include/kvm/pci-shmem.h | 32 +
+ tools/kvm/include/kvm/pci.h | 95 ++
+ tools/kvm/include/kvm/qcow.h | 133 +++
+ tools/kvm/include/kvm/rbtree-interval.h | 28 +
+ tools/kvm/include/kvm/read-write.h | 43 +
+ tools/kvm/include/kvm/rtc.h | 9 +
+ tools/kvm/include/kvm/rwsem.h | 39 +
+ tools/kvm/include/kvm/sdl.h | 28 +
+ tools/kvm/include/kvm/segment.h | 21 +
+ tools/kvm/include/kvm/strbuf.h | 20 +
+ tools/kvm/include/kvm/symbol.h | 30 +
+ tools/kvm/include/kvm/term.h | 24 +
+ tools/kvm/include/kvm/threadpool.h | 38 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 360 ++++++
+ tools/kvm/include/kvm/util-init.h | 51 +
+ tools/kvm/include/kvm/util.h | 97 ++
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 76 ++
+ tools/kvm/include/kvm/virtio-balloon.h | 9 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 10 +
+ tools/kvm/include/kvm/virtio-mmio.h | 58 +
+ tools/kvm/include/kvm/virtio-net.h | 30 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
+ tools/kvm/include/kvm/virtio-pci.h | 49 +
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio-scsi.h | 26 +
+ tools/kvm/include/kvm/virtio.h | 102 ++
+ tools/kvm/include/kvm/vnc.h | 22 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/compiler.h | 20 +
+ tools/kvm/include/linux/kernel.h | 39 +
+ tools/kvm/include/linux/module.h | 6 +
+ tools/kvm/include/linux/prefetch.h | 6 +
+ tools/kvm/include/linux/stddef.h | 16 +
+ tools/kvm/include/linux/types.h | 51 +
+ tools/kvm/ioeventfd.c | 216 ++++
+ tools/kvm/ioport.c | 198 ++++
+ tools/kvm/kvm-cmd.c | 91 ++
+ tools/kvm/kvm-cpu.c | 242 ++++
+ tools/kvm/kvm-ipc.c | 498 +++++++++
+ tools/kvm/kvm.c | 458 ++++++++
+ tools/kvm/main.c | 19 +
+ tools/kvm/mmio.c | 139 +++
+ tools/kvm/net/uip/arp.c | 30 +
+ tools/kvm/net/uip/buf.c | 114 ++
+ tools/kvm/net/uip/core.c | 190 ++++
+ tools/kvm/net/uip/csum.c | 92 ++
+ tools/kvm/net/uip/dhcp.c | 202 ++++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 345 ++++++
+ tools/kvm/net/uip/udp.c | 236 ++++
+ tools/kvm/pci.c | 215 ++++
+ tools/kvm/powerpc/boot.c | 8 +
+ tools/kvm/powerpc/cpu_info.c | 195 ++++
+ tools/kvm/powerpc/cpu_info.h | 42 +
+ tools/kvm/powerpc/include/kvm/barrier.h | 6 +
+ tools/kvm/powerpc/include/kvm/kvm-arch.h | 68 ++
+ tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 ++
+ tools/kvm/powerpc/ioport.c | 18 +
+ tools/kvm/powerpc/irq.c | 75 ++
+ tools/kvm/powerpc/kvm-cpu.c | 293 +++++
+ tools/kvm/powerpc/kvm.c | 529 +++++++++
+ tools/kvm/powerpc/spapr.h | 93 ++
+ tools/kvm/powerpc/spapr_hcall.c | 134 +++
+ tools/kvm/powerpc/spapr_hvcons.c | 108 ++
+ tools/kvm/powerpc/spapr_hvcons.h | 19 +
+ tools/kvm/powerpc/spapr_pci.c | 423 +++++++
+ tools/kvm/powerpc/spapr_pci.h | 57 +
+ tools/kvm/powerpc/spapr_rtas.c | 229 ++++
+ tools/kvm/powerpc/xics.c | 514 +++++++++
+ tools/kvm/powerpc/xics.h | 23 +
+ tools/kvm/symbol.c | 133 +++
+ tools/kvm/term.c | 171 +++
+ tools/kvm/tests/Makefile | 19 +
+ tools/kvm/tests/boot/Makefile | 13 +
+ tools/kvm/tests/boot/init.c | 11 +
+ tools/kvm/tests/kernel/.gitignore | 2 +
+ tools/kvm/tests/kernel/Makefile | 20 +
+ tools/kvm/tests/kernel/README | 16 +
+ tools/kvm/tests/kernel/kernel.S | 8 +
+ tools/kvm/tests/pit/.gitignore | 2 +
+ tools/kvm/tests/pit/Makefile | 20 +
+ tools/kvm/tests/pit/README | 16 +
+ tools/kvm/tests/pit/tick.S | 101 ++
+ tools/kvm/ui/sdl.c | 321 ++++++
+ tools/kvm/ui/vnc.c | 248 +++++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/init.c | 69 ++
+ tools/kvm/util/kvm-ifup-vbr0 | 6 +
+ tools/kvm/util/parse-options.c | 577 ++++++++++
+ tools/kvm/util/rbtree-interval.c | 89 ++
+ tools/kvm/util/read-write.c | 354 ++++++
+ tools/kvm/util/set_private_br.sh | 51 +
+ tools/kvm/util/strbuf.c | 62 ++
+ tools/kvm/util/threadpool.c | 173 +++
+ tools/kvm/util/util.c | 133 +++
+ tools/kvm/virtio/9p-pdu.c | 287 +++++
+ tools/kvm/virtio/9p.c | 1448 ++++++++++++++++++++++++
+ tools/kvm/virtio/balloon.c | 270 +++++
+ tools/kvm/virtio/blk.c | 315 ++++++
+ tools/kvm/virtio/console.c | 203 ++++
+ tools/kvm/virtio/core.c | 233 ++++
+ tools/kvm/virtio/mmio.c | 264 +++++
+ tools/kvm/virtio/net.c | 670 +++++++++++
+ tools/kvm/virtio/pci.c | 398 +++++++
+ tools/kvm/virtio/rng.c | 193 ++++
+ tools/kvm/virtio/scsi.c | 309 ++++++
+ tools/kvm/x86/bios.c | 174 +++
+ tools/kvm/x86/bios/.gitignore | 3 +
+ tools/kvm/x86/bios/bios-rom.S | 12 +
+ tools/kvm/x86/bios/e820.c | 72 ++
+ tools/kvm/x86/bios/entry.S | 92 ++
+ tools/kvm/x86/bios/gen-offsets.sh | 14 +
+ tools/kvm/x86/bios/int10.c | 110 ++
+ tools/kvm/x86/bios/int15.c | 18 +
+ tools/kvm/x86/bios/local.S | 7 +
+ tools/kvm/x86/bios/macro.S | 25 +
+ tools/kvm/x86/bios/memcpy.c | 23 +
+ tools/kvm/x86/bios/rom.ld.S | 16 +
+ tools/kvm/x86/boot.c | 41 +
+ tools/kvm/x86/cpuid.c | 60 +
+ tools/kvm/x86/include/kvm/assembly.h | 24 +
+ tools/kvm/x86/include/kvm/barrier.h | 20 +
+ tools/kvm/x86/include/kvm/bios-export.h | 13 +
+ tools/kvm/x86/include/kvm/bios.h | 93 ++
+ tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
+ tools/kvm/x86/include/kvm/cpufeature.h | 41 +
+ tools/kvm/x86/include/kvm/interrupt.h | 26 +
+ tools/kvm/x86/include/kvm/kvm-arch.h | 43 +
+ tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
+ tools/kvm/x86/include/kvm/mptable.h | 9 +
+ tools/kvm/x86/interrupt.c | 28 +
+ tools/kvm/x86/ioport.c | 77 ++
+ tools/kvm/x86/irq.c | 224 ++++
+ tools/kvm/x86/kvm-cpu.c | 425 +++++++
+ tools/kvm/x86/kvm.c | 362 ++++++
+ tools/kvm/x86/mptable.c | 289 +++++
+ tools/perf/Makefile | 83 +-
+ tools/perf/bash_completion | 50 +-
+ tools/perf/builtin-buildid-cache.c | 58 +-
+ tools/perf/builtin-buildid-list.c | 55 +-
+ tools/perf/builtin-diff.c | 68 +-
+ tools/perf/builtin-evlist.c | 21 +-
+ tools/perf/builtin-help.c | 40 +-
+ tools/perf/builtin-inject.c | 88 +-
+ tools/perf/builtin-kmem.c | 66 +-
+ tools/perf/builtin-kvm.c | 460 ++++----
+ tools/perf/builtin-lock.c | 90 +-
+ tools/perf/builtin-probe.c | 26 +-
+ tools/perf/builtin-record.c | 27 +-
+ tools/perf/builtin-report.c | 4 +-
+ tools/perf/builtin-sched.c | 2 +-
+ tools/perf/builtin-script.c | 90 +-
+ tools/perf/builtin-stat.c | 328 +++---
+ tools/perf/builtin-timechart.c | 100 +-
+ tools/perf/builtin-top.c | 11 +-
+ tools/perf/builtin-trace.c | 134 ++-
+ tools/perf/perf.c | 4 +-
+ tools/perf/ui/browsers/hists.c | 12 +-
+ tools/perf/ui/gtk/browser.c | 6 +-
+ tools/perf/ui/gtk/util.c | 2 +-
+ tools/perf/ui/helpline.h | 18 +-
+ tools/perf/ui/hist.c | 145 ++-
+ tools/perf/ui/setup.c | 2 +-
+ tools/perf/ui/stdio/hist.c | 45 +-
+ tools/perf/util/annotate.h | 8 +-
+ tools/perf/util/cache.h | 38 +-
+ tools/perf/util/debug.c | 2 +-
+ tools/perf/util/debug.h | 17 +-
+ tools/perf/util/evlist.c | 88 +-
+ tools/perf/util/evlist.h | 18 +-
+ tools/perf/util/generate-cmdlist.sh | 4 +-
+ tools/perf/util/hist.c | 66 +-
+ tools/perf/util/hist.h | 38 +-
+ tools/perf/util/map.c | 2 +-
+ tools/perf/util/parse-options.c | 8 +
+ tools/perf/util/parse-options.h | 1 +
+ tools/perf/util/path.c | 2 +-
+ tools/perf/util/perf_regs.h | 4 +-
+ tools/perf/util/sort.h | 19 +-
+ tools/perf/util/symbol.h | 10 +-
+ tools/perf/util/unwind.h | 4 +-
+ tools/perf/util/util.c | 4 +-
+ 318 files changed, 29098 insertions(+), 1480 deletions(-)
+ create mode 100644 Documentation/acpi/initrd_table_override.txt
+ create mode 100644 arch/x86/kernel/cpu/perf_event_knc.c
+ create mode 100644 include/linux/earlycpio.h
+ create mode 100644 include/linux/page-flags-layout.h
+ create mode 100644 lib/earlycpio.c
+ create mode 100644 tools/kvm/.gitignore
+ create mode 100644 tools/kvm/CREDITS-Git
+ create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
+ create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
+ create mode 100644 tools/kvm/Documentation/kvm-debug.txt
+ create mode 100644 tools/kvm/Documentation/kvm-list.txt
+ create mode 100644 tools/kvm/Documentation/kvm-pause.txt
+ create mode 100644 tools/kvm/Documentation/kvm-resume.txt
+ create mode 100644 tools/kvm/Documentation/kvm-run.txt
+ create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
+ create mode 100644 tools/kvm/Documentation/kvm-setup.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stat.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stop.txt
+ create mode 100644 tools/kvm/Documentation/kvm-version.txt
+ create mode 100644 tools/kvm/Documentation/virtio-console.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ create mode 100644 tools/kvm/builtin-balloon.c
+ create mode 100644 tools/kvm/builtin-debug.c
+ create mode 100644 tools/kvm/builtin-help.c
+ create mode 100644 tools/kvm/builtin-list.c
+ create mode 100644 tools/kvm/builtin-pause.c
+ create mode 100644 tools/kvm/builtin-resume.c
+ create mode 100644 tools/kvm/builtin-run.c
+ create mode 100644 tools/kvm/builtin-sandbox.c
+ create mode 100644 tools/kvm/builtin-setup.c
+ create mode 100644 tools/kvm/builtin-stat.c
+ create mode 100644 tools/kvm/builtin-stop.c
+ create mode 100644 tools/kvm/builtin-version.c
+ create mode 100644 tools/kvm/code16gcc.h
+ create mode 100644 tools/kvm/command-list.txt
+ create mode 100644 tools/kvm/config/feature-tests.mak
+ create mode 100644 tools/kvm/config/utilities.mak
+ create mode 100644 tools/kvm/disk/blk.c
+ create mode 100644 tools/kvm/disk/core.c
+ create mode 100644 tools/kvm/disk/qcow.c
+ create mode 100644 tools/kvm/disk/raw.c
+ create mode 100644 tools/kvm/framebuffer.c
+ create mode 100644 tools/kvm/guest/init.c
+ create mode 100644 tools/kvm/guest_compat.c
+ create mode 100644 tools/kvm/hw/i8042.c
+ create mode 100644 tools/kvm/hw/pci-shmem.c
+ create mode 100644 tools/kvm/hw/rtc.c
+ create mode 100644 tools/kvm/hw/serial.c
+ create mode 100644 tools/kvm/hw/vesa.c
+ create mode 100644 tools/kvm/include/asm/hweight.h
+ create mode 100644 tools/kvm/include/bios/memcpy.h
+ create mode 100644 tools/kvm/include/kvm/8250-serial.h
+ create mode 100644 tools/kvm/include/kvm/apic.h
+ create mode 100644 tools/kvm/include/kvm/brlock.h
+ create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
+ create mode 100644 tools/kvm/include/kvm/builtin-debug.h
+ create mode 100644 tools/kvm/include/kvm/builtin-help.h
+ create mode 100644 tools/kvm/include/kvm/builtin-list.h
+ create mode 100644 tools/kvm/include/kvm/builtin-pause.h
+ create mode 100644 tools/kvm/include/kvm/builtin-resume.h
+ create mode 100644 tools/kvm/include/kvm/builtin-run.h
+ create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
+ create mode 100644 tools/kvm/include/kvm/builtin-setup.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stat.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stop.h
+ create mode 100644 tools/kvm/include/kvm/builtin-version.h
+ create mode 100644 tools/kvm/include/kvm/compiler.h
+ create mode 100644 tools/kvm/include/kvm/disk-image.h
+ create mode 100644 tools/kvm/include/kvm/e820.h
+ create mode 100644 tools/kvm/include/kvm/framebuffer.h
+ create mode 100644 tools/kvm/include/kvm/guest_compat.h
+ create mode 100644 tools/kvm/include/kvm/i8042.h
+ create mode 100644 tools/kvm/include/kvm/ioeventfd.h
+ create mode 100644 tools/kvm/include/kvm/ioport.h
+ create mode 100644 tools/kvm/include/kvm/irq.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
+ create mode 100644 tools/kvm/include/kvm/kvm-config.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
+ create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
+ create mode 100644 tools/kvm/include/kvm/kvm.h
+ create mode 100644 tools/kvm/include/kvm/msi.h
+ create mode 100644 tools/kvm/include/kvm/mutex.h
+ create mode 100644 tools/kvm/include/kvm/parse-options.h
+ create mode 100644 tools/kvm/include/kvm/pci-shmem.h
+ create mode 100644 tools/kvm/include/kvm/pci.h
+ create mode 100644 tools/kvm/include/kvm/qcow.h
+ create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
+ create mode 100644 tools/kvm/include/kvm/read-write.h
+ create mode 100644 tools/kvm/include/kvm/rtc.h
+ create mode 100644 tools/kvm/include/kvm/rwsem.h
+ create mode 100644 tools/kvm/include/kvm/sdl.h
+ create mode 100644 tools/kvm/include/kvm/segment.h
+ create mode 100644 tools/kvm/include/kvm/strbuf.h
+ create mode 100644 tools/kvm/include/kvm/symbol.h
+ create mode 100644 tools/kvm/include/kvm/term.h
+ create mode 100644 tools/kvm/include/kvm/threadpool.h
+ create mode 100644 tools/kvm/include/kvm/types.h
+ create mode 100644 tools/kvm/include/kvm/uip.h
+ create mode 100644 tools/kvm/include/kvm/util-init.h
+ create mode 100644 tools/kvm/include/kvm/util.h
+ create mode 100644 tools/kvm/include/kvm/vesa.h
+ create mode 100644 tools/kvm/include/kvm/virtio-9p.h
+ create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
+ create mode 100644 tools/kvm/include/kvm/virtio-blk.h
+ create mode 100644 tools/kvm/include/kvm/virtio-console.h
+ create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
+ create mode 100644 tools/kvm/include/kvm/virtio-net.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci.h
+ create mode 100644 tools/kvm/include/kvm/virtio-rng.h
+ create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
+ create mode 100644 tools/kvm/include/kvm/virtio.h
+ create mode 100644 tools/kvm/include/kvm/vnc.h
+ create mode 100644 tools/kvm/include/linux/bitops.h
+ create mode 100644 tools/kvm/include/linux/byteorder.h
+ create mode 100644 tools/kvm/include/linux/compiler.h
+ create mode 100644 tools/kvm/include/linux/kernel.h
+ create mode 100644 tools/kvm/include/linux/module.h
+ create mode 100644 tools/kvm/include/linux/prefetch.h
+ create mode 100644 tools/kvm/include/linux/stddef.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.c
+ create mode 100644 tools/kvm/kvm-cmd.c
+ create mode 100644 tools/kvm/kvm-cpu.c
+ create mode 100644 tools/kvm/kvm-ipc.c
+ create mode 100644 tools/kvm/kvm.c
+ create mode 100644 tools/kvm/main.c
+ create mode 100644 tools/kvm/mmio.c
+ create mode 100644 tools/kvm/net/uip/arp.c
+ create mode 100644 tools/kvm/net/uip/buf.c
+ create mode 100644 tools/kvm/net/uip/core.c
+ create mode 100644 tools/kvm/net/uip/csum.c
+ create mode 100644 tools/kvm/net/uip/dhcp.c
+ create mode 100644 tools/kvm/net/uip/icmp.c
+ create mode 100644 tools/kvm/net/uip/ipv4.c
+ create mode 100644 tools/kvm/net/uip/tcp.c
+ create mode 100644 tools/kvm/net/uip/udp.c
+ create mode 100644 tools/kvm/pci.c
+ create mode 100644 tools/kvm/powerpc/boot.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/powerpc/ioport.c
+ create mode 100644 tools/kvm/powerpc/irq.c
+ create mode 100644 tools/kvm/powerpc/kvm-cpu.c
+ create mode 100644 tools/kvm/powerpc/kvm.c
+ create mode 100644 tools/kvm/powerpc/spapr.h
+ create mode 100644 tools/kvm/powerpc/spapr_hcall.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
+ create mode 100644 tools/kvm/powerpc/spapr_pci.c
+ create mode 100644 tools/kvm/powerpc/spapr_pci.h
+ create mode 100644 tools/kvm/powerpc/spapr_rtas.c
+ create mode 100644 tools/kvm/powerpc/xics.c
+ create mode 100644 tools/kvm/powerpc/xics.h
+ create mode 100644 tools/kvm/symbol.c
+ create mode 100644 tools/kvm/term.c
+ create mode 100644 tools/kvm/tests/Makefile
+ create mode 100644 tools/kvm/tests/boot/Makefile
+ create mode 100644 tools/kvm/tests/boot/init.c
+ create mode 100644 tools/kvm/tests/kernel/.gitignore
+ create mode 100644 tools/kvm/tests/kernel/Makefile
+ create mode 100644 tools/kvm/tests/kernel/README
+ create mode 100644 tools/kvm/tests/kernel/kernel.S
+ create mode 100644 tools/kvm/tests/pit/.gitignore
+ create mode 100644 tools/kvm/tests/pit/Makefile
+ create mode 100644 tools/kvm/tests/pit/README
+ create mode 100644 tools/kvm/tests/pit/tick.S
+ create mode 100644 tools/kvm/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100644 tools/kvm/util/init.c
+ create mode 100755 tools/kvm/util/kvm-ifup-vbr0
+ create mode 100644 tools/kvm/util/parse-options.c
+ create mode 100644 tools/kvm/util/rbtree-interval.c
+ create mode 100644 tools/kvm/util/read-write.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/util/threadpool.c
+ create mode 100644 tools/kvm/util/util.c
+ create mode 100644 tools/kvm/virtio/9p-pdu.c
+ create mode 100644 tools/kvm/virtio/9p.c
+ create mode 100644 tools/kvm/virtio/balloon.c
+ create mode 100644 tools/kvm/virtio/blk.c
+ create mode 100644 tools/kvm/virtio/console.c
+ create mode 100644 tools/kvm/virtio/core.c
+ create mode 100644 tools/kvm/virtio/mmio.c
+ create mode 100644 tools/kvm/virtio/net.c
+ create mode 100644 tools/kvm/virtio/pci.c
+ create mode 100644 tools/kvm/virtio/rng.c
+ create mode 100644 tools/kvm/virtio/scsi.c
+ create mode 100644 tools/kvm/x86/bios.c
+ create mode 100644 tools/kvm/x86/bios/.gitignore
+ create mode 100644 tools/kvm/x86/bios/bios-rom.S
+ create mode 100644 tools/kvm/x86/bios/e820.c
+ create mode 100644 tools/kvm/x86/bios/entry.S
+ create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/x86/bios/int10.c
+ create mode 100644 tools/kvm/x86/bios/int15.c
+ create mode 100644 tools/kvm/x86/bios/local.S
+ create mode 100644 tools/kvm/x86/bios/macro.S
+ create mode 100644 tools/kvm/x86/bios/memcpy.c
+ create mode 100644 tools/kvm/x86/bios/rom.ld.S
+ create mode 100644 tools/kvm/x86/boot.c
+ create mode 100644 tools/kvm/x86/cpuid.c
+ create mode 100644 tools/kvm/x86/include/kvm/assembly.h
+ create mode 100644 tools/kvm/x86/include/kvm/barrier.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios.h
+ create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/mptable.h
+ create mode 100644 tools/kvm/x86/interrupt.c
+ create mode 100644 tools/kvm/x86/ioport.c
+ create mode 100644 tools/kvm/x86/irq.c
+ create mode 100644 tools/kvm/x86/kvm-cpu.c
+ create mode 100644 tools/kvm/x86/kvm.c
+ create mode 100644 tools/kvm/x86/mptable.c
+Merging rcu/rcu/next (593d100 Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b)
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
+$ git merge cputime/cputime
+Already up-to-date.
+Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
+$ git merge kmemleak/kmemleak
+Auto-merging mm/kmemleak.c
+Merge made by the 'recursive' strategy.
+ mm/kmemleak.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging kvm/linux-next (3d11df7 KVM: s390: Fix vcpu_load handling in interrupt code)
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (1041112 KVM: PPC: 44x: fix DCR read/write)
+$ git merge kvm-ppc/kvm-ppc-next
+Auto-merging include/linux/kvm_host.h
+Auto-merging drivers/tty/Kconfig
+Auto-merging arch/powerpc/sysdev/fsl_msi.c
+Auto-merging arch/powerpc/kvm/trace.h
+Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
+Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
+Auto-merging arch/powerpc/include/asm/kvm_book3s.h
+Auto-merging arch/powerpc/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 49 +++-
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/epapr_hcalls.h | 36 +--
+ arch/powerpc/include/asm/fsl_hcalls.h | 36 +--
+ arch/powerpc/include/asm/kvm.h | 59 +++++
+ arch/powerpc/include/asm/kvm_book3s.h | 2 +-
+ arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +-
+ arch/powerpc/include/asm/kvm_host.h | 38 ++-
+ arch/powerpc/include/asm/kvm_para.h | 21 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 64 ++++-
+ arch/powerpc/include/asm/reg_booke.h | 7 +
+ arch/powerpc/kernel/epapr_hcalls.S | 28 +++
+ arch/powerpc/kernel/epapr_paravirt.c | 11 +-
+ arch/powerpc/kernel/kvm.c | 2 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 5 +
+ arch/powerpc/kvm/44x.c | 1 +
+ arch/powerpc/kvm/44x_emulate.c | 112 +++++----
+ arch/powerpc/kvm/Kconfig | 3 +
+ arch/powerpc/kvm/book3s.c | 125 ++++++++++
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 65 ++++--
+ arch/powerpc/kvm/book3s_hv.c | 337 +++++++++++++++++++++------
+ arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 +-
+ arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
+ arch/powerpc/kvm/book3s_pr.c | 180 ++++++++++----
+ arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
+ arch/powerpc/kvm/booke.c | 310 ++++++++++++++++++++----
+ arch/powerpc/kvm/booke_emulate.c | 22 +-
+ arch/powerpc/kvm/e500.h | 3 +-
+ arch/powerpc/kvm/e500_tlb.c | 92 ++++++--
+ arch/powerpc/kvm/powerpc.c | 150 ++++++++++--
+ arch/powerpc/kvm/trace.h | 200 +++++++++++++---
+ arch/powerpc/platforms/Kconfig | 1 +
+ arch/powerpc/sysdev/fsl_msi.c | 9 +-
+ arch/powerpc/sysdev/fsl_soc.c | 2 +
+ drivers/tty/Kconfig | 1 +
+ drivers/virt/Kconfig | 1 +
+ include/linux/kvm.h | 10 +-
+ include/linux/kvm_host.h | 1 +
+ 41 files changed, 1637 insertions(+), 381 deletions(-)
+Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
+$ git merge xen/upstream/xen
+Already up-to-date.
+Merging xen-two/linux-next (8825f04 Merge branch 'stable/for-linus-3.7' into linux-next)
+$ git merge xen-two/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/net/xen-netback/netback.c | 11 ++++++--
+ drivers/xen/grant-table.c | 53 ------------------------------------
+ drivers/xen/xenbus/xenbus_client.c | 6 ++--
+ include/xen/grant_table.h | 12 --------
+ 4 files changed, 12 insertions(+), 70 deletions(-)
+$ git am -3 ../patches/0001-The-Xen-tree-tries-to-add-a-line-to.patch
+Applying: The Xen tree tries to add a line to arch/arm/mach-vexpress/Makefile.boot that has been removed by the following commit in Linus' master:
+Using index info to reconstruct a base tree...
+M arch/arm/boot/dts/Makefile
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (2b0f620 Merge branch 'for-3.7' into for-next)
+$ git merge workqueues/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
+$ git merge drivers-x86/linux-next
+Auto-merging drivers/platform/x86/asus-wmi.c
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 76 insertions(+)
+Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (613dac3 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' into regmap-next)
+$ git merge regmap/for-next
+Already up-to-date.
+Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (2f73c39 leds: add output driver configuration for pca9633 led driver)
+$ git merge leds/for-next
+Removing include/linux/platform_data/leds-lm3556.h
+Auto-merging include/linux/leds.h
+Auto-merging drivers/leds/leds-wm8350.c
+Removing drivers/leds/leds-lm3556.c
+Auto-merging drivers/leds/Makefile
+Auto-merging drivers/leds/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/leds/leds-lp5523.txt | 21 +-
+ drivers/leds/Kconfig | 26 +-
+ drivers/leds/Makefile | 3 +-
+ drivers/leds/led-class.c | 15 +
+ drivers/leds/led-core.c | 16 +-
+ drivers/leds/led-triggers.c | 17 +-
+ drivers/leds/leds-clevo-mail.c | 10 +-
+ drivers/leds/leds-gpio.c | 19 +-
+ drivers/leds/leds-lm3530.c | 16 +-
+ drivers/leds/leds-lm3556.c | 512 -------------------------
+ drivers/leds/leds-lm355x.c | 572 ++++++++++++++++++++++++++++
+ drivers/leds/leds-lm3642.c | 462 ++++++++++++++++++++++
+ drivers/leds/leds-lp5523.c | 75 ++--
+ drivers/leds/leds-pca9633.c | 19 +-
+ drivers/leds/leds-wm8350.c | 29 +-
+ drivers/leds/leds.h | 2 +
+ include/linux/leds-lp5523.h | 1 +
+ include/linux/leds.h | 4 +
+ include/linux/platform_data/leds-lm3556.h | 50 ---
+ include/linux/platform_data/leds-lm355x.h | 66 ++++
+ include/linux/platform_data/leds-lm3642.h | 38 ++
+ include/linux/platform_data/leds-pca9633.h | 35 ++
+ 22 files changed, 1350 insertions(+), 658 deletions(-)
+ delete mode 100644 drivers/leds/leds-lm3556.c
+ create mode 100644 drivers/leds/leds-lm355x.c
+ create mode 100644 drivers/leds/leds-lm3642.c
+ delete mode 100644 include/linux/platform_data/leds-lm3556.h
+ create mode 100644 include/linux/platform_data/leds-lm355x.h
+ create mode 100644 include/linux/platform_data/leds-lm3642.h
+ create mode 100644 include/linux/platform_data/leds-pca9633.h
+Merging driver-core/driver-core-next (e0f21e6 memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl())
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge usb/usb-next
+Already up-to-date.
+Merging staging/staging-next (e187895 staging: comedi: jr3_pci: fix iomem dereference)
+$ git merge staging/staging-next
+Already up-to-date.
+Merging char-misc/char-misc-next (5dc2db0 drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
+$ git merge tmem/linux-next
+Auto-merging include/xen/xen.h
+Auto-merging include/xen/interface/xen.h
+Auto-merging arch/x86/xen/smp.c
+Auto-merging arch/x86/xen/setup.c
+Auto-merging arch/x86/include/asm/xen/page.h
+Auto-merging arch/x86/include/asm/xen/interface.h
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/xen/interface.h | 3 ++-
+ arch/x86/include/asm/xen/page.h | 3 +++
+ arch/x86/xen/setup.c | 13 +++++++++---
+ arch/x86/xen/smp.c | 39 ++++++++++++++++++----------------
+ drivers/xen/cpu_hotplug.c | 3 ++-
+ include/xen/interface/xen.h | 1 +
+ include/xen/xen.h | 4 ++++
+ 7 files changed, 43 insertions(+), 23 deletions(-)
+Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
+$ git merge writeback/writeback-for-next
+Auto-merging fs/fs-writeback.c
+Merge made by the 'recursive' strategy.
+ fs/fs-writeback.c | 2 +-
+ mm/backing-dev.c | 50 ++++++++++++++++++++++++++------------------------
+ mm/page-writeback.c | 14 +++++++++++---
+ 3 files changed, 38 insertions(+), 28 deletions(-)
+Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (e1b2dc7 pinctrl: add bcm2835 driver)
+$ git merge pinctrl/for-next
+Already up-to-date.
+Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
+$ git merge vhost/linux-next
+Resolved 'drivers/net/tun.c' using previous resolution.
+Auto-merging drivers/net/tun.c
+CONFLICT (content): Merge conflict in drivers/net/tun.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9f57531] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
+$ git merge memblock/memblock-kill-early_node_map
+Already up-to-date.
+Merging remoteproc/for-next (ed26d19 remoteproc: fix (again) the virtio-related build breakage)
+$ git merge remoteproc/for-next
+Merge made by the 'recursive' strategy.
+ drivers/remoteproc/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
+$ git merge irqdomain/irqdomain/next
+Already up-to-date.
+Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging gpio-lw/for-next (901acf5 gpio: pcf857x: select IRQ_DOMAIN)
+$ git merge gpio-lw/for-next
+Already up-to-date.
+Merging arm-soc/for-next (fdb1cd7 Merge branch 'fixes' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging drivers/mmc/host/sdhci-tegra.c
+Auto-merging arch/arm/mach-davinci/da850.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../brcm,bcm2835-armctrl-ic.txt | 2 +-
+ .../bindings/timer/brcm,bcm2835-system-timer.txt | 2 +-
+ arch/arm/Kconfig | 2 -
+ arch/arm/boot/dts/Makefile | 11 ++---
+ arch/arm/boot/dts/tegra20-seaboard.dts | 2 +-
+ arch/arm/boot/dts/tegra20.dtsi | 4 +-
+ arch/arm/mach-at91/pm.c | 5 +-
+ arch/arm/mach-at91/setup.c | 2 +-
+ arch/arm/mach-davinci/da850.c | 2 +-
+ arch/arm/mach-footbridge/include/mach/irqs.h | 2 -
+ arch/arm/mach-iop13xx/iq81340sc.c | 2 +-
+ arch/arm/mach-iop13xx/pci.c | 2 +-
+ arch/arm/mach-ks8695/include/mach/memory.h | 3 +-
+ arch/arm/mach-mv78xx0/addr-map.c | 2 +-
+ arch/arm/mach-mv78xx0/common.c | 2 +-
+ arch/arm/mach-pxa/cm-x2xx.c | 1 +
+ arch/arm/mach-pxa/palmte2.c | 2 +
+ arch/arm/mach-pxa/sharpsl_pm.c | 48 --------------------
+ arch/arm/mach-pxa/viper.c | 3 +-
+ arch/arm/mach-rpc/ecard.c | 4 +-
+ arch/arm/mach-s3c24xx/irq-s3c2416.c | 6 +--
+ arch/arm/mach-s3c24xx/irq-s3c2443.c | 4 +-
+ arch/arm/mach-s3c24xx/simtec-usb.c | 2 +-
+ arch/arm/mach-shark/pci.c | 2 +-
+ arch/arm/mach-tegra/Kconfig | 6 +--
+ arch/arm/mach-ux500/Kconfig | 4 +-
+ arch/arm/mach-vt8500/include/mach/uncompress.h | 8 ++--
+ arch/arm/mach-vt8500/vt8500.c | 5 +-
+ drivers/char/ds1620.c | 8 ++--
+ drivers/char/nwflash.c | 4 +-
+ drivers/mmc/host/sdhci-tegra.c | 1 -
+ sound/oss/waveartist.c | 4 +-
+ 32 files changed, 53 insertions(+), 104 deletions(-)
+Merging ep93xx/ep93xx-for-next (70f0f7c Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ixp4xx/next (2346020 IXP4xx: map CPU config registers within VMALLOC region.)
+$ git merge ixp4xx/next
+Resolved 'arch/arm/mach-ixp4xx/common.c' using previous resolution.
+Resolved 'arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h' using previous resolution.
+Auto-merging drivers/crypto/Kconfig
+Auto-merging drivers/char/hw_random/Kconfig
+Auto-merging arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
+CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
+Auto-merging arch/arm/mach-ixp4xx/common.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/common.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 56ade9a] Merge remote-tracking branch 'ixp4xx/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/common/dmabounce.c | 4 +-
+ arch/arm/mach-ixp4xx/common-pci.c | 1 +
+ arch/arm/mach-ixp4xx/common.c | 13 +++----
+ arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +-
+ arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +-
+ arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 ++++++++++-------------
+ arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +++---
+ arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++-
+ arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 14 +------
+ drivers/char/hw_random/Kconfig | 6 +--
+ drivers/char/hw_random/ixp4xx-rng.c | 5 ++-
+ drivers/crypto/Kconfig | 2 +-
+ drivers/crypto/ixp4xx_crypto.c | 12 +++---
+ drivers/net/wan/ixp4xx_hss.c | 2 +-
+ 14 files changed, 62 insertions(+), 71 deletions(-)
+Merging msm/for-next (a0d271c Linux 3.6)
+$ git merge msm/for-next
+Already up-to-date.
+Merging renesas/next (b681273 Merge branch 'heads/boards' into next)
+$ git merge renesas/next
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
+Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c
+Auto-merging arch/arm/mach-shmobile/include/mach/sh7372.h
+Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
+Auto-merging arch/arm/configs/kzm9g_defconfig
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f1f60ba] Merge remote-tracking branch 'renesas/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 9 +++++++++
+ arch/arm/configs/armadillo800eva_defconfig | 1 +
+ arch/arm/configs/kzm9g_defconfig | 4 ++++
+ arch/arm/configs/mackerel_defconfig | 18 ++++++++++++++++--
+ arch/arm/mach-shmobile/board-kzm9g.c | 14 +++++++++++++-
+ arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++++
+ arch/arm/mach-shmobile/setup-r8a7740.c | 16 ++++++++++++++++
+ arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++++++++++++++++
+ arch/arm/mm/proc-v7-2level.S | 8 ++++++++
+ 9 files changed, 91 insertions(+), 3 deletions(-)
+Merging samsung/for-next (59e65fd Merge branch 'next/dt-samsung-new' into for-next)
+$ git merge samsung/for-next
+Resolved 'arch/arm/mach-exynos/clock-exynos5.c' using previous resolution.
+Auto-merging arch/arm/mach-exynos/clock-exynos5.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos/clock-exynos5.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f8d8162] Merge remote-tracking branch 'samsung/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging tegra/for-next (979570e Linux 3.6-rc7)
+$ git merge tegra/for-next
+Already up-to-date.
+Merging kvmtool/master (da22ea8 kvm tools: Do setup_fdt() later, get powerpc to boot again)
+$ git merge kvmtool/master
+Merge made by the 'recursive' strategy.
+ tools/kvm/powerpc/ioport.c | 2 +-
+ tools/kvm/powerpc/irq.c | 19 -------------------
+ tools/kvm/powerpc/kvm-cpu.c | 3 ---
+ tools/kvm/powerpc/kvm.c | 8 ++++----
+ tools/kvm/powerpc/spapr_hvcons.c | 6 +++---
+ tools/kvm/powerpc/spapr_rtas.c | 14 +++++++++-----
+ tools/kvm/powerpc/xics.c | 38 +++++++++++++++++++++++---------------
+ tools/kvm/powerpc/xics.h | 5 -----
+ 8 files changed, 40 insertions(+), 55 deletions(-)
+Merging dma-mapping/dma-mapping-next (461b6f0 Merge branch 'next-cleanup' into for-v3.7)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell)
+$ git merge pwm/for-next
+Auto-merging drivers/pwm/pwm-ab8500.c
+Auto-merging drivers/pwm/Makefile
+Auto-merging drivers/pwm/Kconfig
+Auto-merging drivers/misc/Kconfig
+Removing arch/unicore32/kernel/pwm.c
+Auto-merging arch/unicore32/Kconfig
+Removing arch/mips/jz4740/timer.h
+Removing arch/mips/jz4740/pwm.c
+Auto-merging Documentation/devicetree/bindings/pwm/mxs-pwm.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/pwm/imx-pwm.txt | 17 ++
+ Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 2 +-
+ Documentation/driver-model/devres.txt | 4 +
+ Documentation/pwm.txt | 3 +-
+ arch/mips/include/asm/mach-jz4740/platform.h | 1 +
+ arch/mips/include/asm/mach-jz4740/timer.h | 113 ++++++++
+ arch/mips/jz4740/Kconfig | 3 -
+ arch/mips/jz4740/Makefile | 2 +-
+ arch/mips/jz4740/board-qi_lb60.c | 1 +
+ arch/mips/jz4740/platform.c | 6 +
+ arch/mips/jz4740/pwm.c | 177 -------------
+ arch/mips/jz4740/time.c | 2 +-
+ arch/mips/jz4740/timer.c | 4 +-
+ arch/mips/jz4740/timer.h | 136 ----------
+ arch/unicore32/Kconfig | 12 +-
+ arch/unicore32/include/mach/regs-ost.h | 18 +-
+ arch/unicore32/kernel/Makefile | 1 -
+ arch/unicore32/kernel/pwm.c | 263 ------------------
+ drivers/misc/Kconfig | 10 -
+ drivers/misc/Makefile | 1 -
+ drivers/pwm/Kconfig | 29 +-
+ drivers/pwm/Makefile | 3 +
+ drivers/pwm/core.c | 82 +++++-
+ drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} | 116 ++++----
+ drivers/pwm/pwm-bfin.c | 3 -
+ drivers/pwm/pwm-imx.c | 278 +++++++++++++-------
+ drivers/pwm/pwm-jz4740.c | 221 ++++++++++++++++
+ drivers/pwm/pwm-puv3.c | 161 ++++++++++++
+ drivers/pwm/pwm-pxa.c | 3 -
+ drivers/pwm/pwm-samsung.c | 3 -
+ drivers/pwm/pwm-tiecap.c | 24 +-
+ drivers/pwm/pwm-tiehrpwm.c | 75 ++++--
+ drivers/video/backlight/pwm_bl.c | 7 +-
+ include/linux/pwm.h | 108 +++++++-
+ 35 files changed, 1069 insertions(+), 822 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/imx-pwm.txt
+ delete mode 100644 arch/mips/jz4740/pwm.c
+ delete mode 100644 arch/mips/jz4740/timer.h
+ delete mode 100644 arch/unicore32/kernel/pwm.c
+ rename drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} (52%)
+ create mode 100644 drivers/pwm/pwm-jz4740.c
+ create mode 100644 drivers/pwm/pwm-puv3.c
+Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
+$ git merge dma-buf/for-next
+Auto-merging drivers/base/dma-buf.c
+Merge made by the 'recursive' strategy.
+ drivers/base/dma-buf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging userns/for-next (5545730 userns: Properly print bluetooth socket uids)
+$ git merge userns/for-next
+Auto-merging net/bluetooth/af_bluetooth.c
+Merge made by the 'recursive' strategy.
+ net/bluetooth/af_bluetooth.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (12f79be alpha: don't open-code trace_report_syscall_{enter,exit})
+$ git merge signal/for-next
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/fork.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/ptrace.h
+Auto-merging include/linux/compat.h
+Auto-merging include/linux/binfmts.h
+Auto-merging fs/exec.c
+CONFLICT (content): Merge conflict in fs/exec.c
+Auto-merging fs/binfmt_elf_fdpic.c
+Auto-merging fs/binfmt_elf.c
+Removing arch/xtensa/include/asm/exec.h
+Auto-merging arch/xtensa/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/xtensa/include/asm/Kbuild
+Auto-merging arch/x86/um/sys_call_table_32.c
+Auto-merging arch/x86/um/Kconfig
+Removing arch/x86/kernel/sys_i386_32.c
+Auto-merging arch/x86/kernel/signal.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
+Auto-merging arch/x86/kernel/process_64.c
+Auto-merging arch/x86/kernel/process_32.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
+Auto-merging arch/x86/kernel/process.c
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/entry_32.S
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/include/asm/thread_info.h
+Auto-merging arch/x86/include/asm/sys_ia32.h
+Auto-merging arch/x86/include/asm/processor.h
+Auto-merging arch/x86/ia32/sys_ia32.c
+Auto-merging arch/x86/ia32/ia32entry.S
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Removing arch/unicore32/include/asm/exec.h
+Auto-merging arch/unicore32/include/asm/Kbuild
+Auto-merging arch/um/kernel/syscall.c
+Auto-merging arch/um/kernel/process.c
+Removing arch/um/kernel/internal.h
+Auto-merging arch/um/kernel/exec.c
+CONFLICT (content): Merge conflict in arch/um/kernel/exec.c
+Auto-merging arch/um/include/asm/processor-generic.h
+Auto-merging arch/tile/kernel/compat_signal.c
+Removing arch/tile/include/asm/exec.h
+Auto-merging arch/tile/include/asm/Kbuild
+Removing arch/sparc/include/asm/exec.h
+Auto-merging arch/sparc/include/asm/Kbuild
+Removing arch/sh/include/asm/exec.h
+Auto-merging arch/s390/kernel/process.c
+Auto-merging arch/s390/kernel/entry64.S
+Auto-merging arch/s390/kernel/compat_wrapper.S
+Auto-merging arch/s390/kernel/compat_linux.h
+Auto-merging arch/s390/kernel/compat_linux.c
+Auto-merging arch/s390/include/asm/unistd.h
+Auto-merging arch/s390/include/asm/processor.h
+Auto-merging arch/s390/Kconfig
+CONFLICT (content): Merge conflict in arch/s390/Kconfig
+Auto-merging arch/powerpc/kernel/sys_ppc32.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/powerpc/kernel/ppc_ksyms.c
+Auto-merging arch/powerpc/kernel/entry_64.S
+Auto-merging arch/powerpc/kernel/entry_32.S
+Auto-merging arch/powerpc/include/asm/unistd.h
+Auto-merging arch/powerpc/include/asm/thread_info.h
+Auto-merging arch/powerpc/include/asm/processor.h
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
+Removing arch/parisc/include/asm/exec.h
+Auto-merging arch/parisc/include/asm/Kbuild
+Auto-merging arch/mn10300/kernel/process.c
+Removing arch/mn10300/kernel/kthread.S
+Removing arch/mn10300/kernel/kernel_execve.S
+Removing arch/mn10300/include/asm/exec.h
+Auto-merging arch/mn10300/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/mn10300/include/asm/Kbuild
+Auto-merging arch/mn10300/Kconfig
+CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
+Auto-merging arch/mips/include/asm/thread_info.h
+Auto-merging arch/microblaze/kernel/signal.c
+Removing arch/microblaze/include/asm/exec.h
+Auto-merging arch/microblaze/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/microblaze/include/asm/Kbuild
+Auto-merging arch/m68k/kernel/process.c
+Removing arch/m68k/include/asm/exec.h
+Auto-merging arch/m68k/include/asm/Kbuild
+Auto-merging arch/m68k/Kconfig
+CONFLICT (content): Merge conflict in arch/m68k/Kconfig
+Removing arch/m32r/include/asm/exec.h
+Auto-merging arch/m32r/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
+Auto-merging arch/ia64/kernel/signal.c
+Removing arch/ia64/include/asm/exec.h
+Auto-merging arch/ia64/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/ia64/include/asm/Kbuild
+Removing arch/h8300/include/asm/exec.h
+Auto-merging arch/h8300/inclRecorded preimage for 'arch/ia64/include/asm/Kbuild'
+Resolved 'arch/alpha/Kconfig' using previous resolution.
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Resolved 'arch/arm/include/asm/thread_info.h' using previous resolution.
+Resolved 'arch/avr32/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/c6x/Kconfig' using previous resolution.
+Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/frv/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/m68k/Kconfig' using previous resolution.
+Resolved 'arch/mn10300/Kconfig' using previous resolution.
+Resolved 'arch/um/kernel/exec.c' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'arch/x86/kernel/process_32.c' using previous resolution.
+Resolved 'arch/x86/kernel/signal.c' using previous resolution.
+Resolved 'fs/exec.c' using previous resolution.
+ude/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
+Auto-merging arch/frv/kernel/process.c
+Removing arch/frv/kernel/kernel_thread.S
+Removing arch/frv/kernel/kernel_execve.S
+Removing arch/frv/include/asm/exec.h
+Auto-merging arch/frv/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/frv/include/asm/Kbuild
+Removing arch/cris/include/asm/exec.h
+Auto-merging arch/cris/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
+Auto-merging arch/c6x/include/asm/unistd.h
+Removing arch/c6x/include/asm/exec.h
+Auto-merging arch/c6x/include/asm/Kbuild
+Auto-merging arch/c6x/Kconfig
+CONFLICT (content): Merge conflict in arch/c6x/Kconfig
+Removing arch/avr32/include/asm/exec.h
+Auto-merging arch/avr32/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/avr32/include/asm/Kbuild
+Auto-merging arch/arm/kernel/process.c
+Auto-merging arch/arm/kernel/entry-common.S
+Auto-merging arch/arm/kernel/calls.S
+Auto-merging arch/arm/include/asm/unistd.h
+Auto-merging arch/arm/include/asm/thread_info.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
+Auto-merging arch/arm/include/asm/ptrace.h
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Auto-merging arch/alpha/kernel/process.c
+Removing arch/alpha/include/asm/exec.h
+Auto-merging arch/alpha/include/asm/Kbuild
+Auto-merging arch/alpha/Kconfig
+CONFLICT (content): Merge conflict in arch/alpha/Kconfig
+Auto-merging arch/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/ia64/include/asm/Kbuild'.
+Recorded resolution for 'arch/microblaze/include/asm/Kbuild'.
+Recorded resolution for 'arch/mn10300/include/asm/Kbuild'.
+Recorded resolution for 'arch/powerpc/Kconfig'.
+Recorded resolution for 'arch/s390/Kconfig'.
+Recorded resolution for 'arch/xtensa/include/asm/Kbuild'.
+[master b9b4f6a] Merge remote-tracking branch 'signal/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/Kconfig | 3 +
+ arch/alpha/Kconfig | 1 +
+ arch/alpha/include/asm/Kbuild | 1 +
+ arch/alpha/include/asm/exec.h | 6 --
+ arch/alpha/include/asm/processor.h | 3 -
+ arch/alpha/include/asm/thread_info.h | 3 +-
+ arch/alpha/include/asm/unistd.h | 2 +
+ arch/alpha/kernel/alpha_ksyms.c | 3 -
+ arch/alpha/kernel/entry.S | 82 +++++++---------------
+ arch/alpha/kernel/process.c | 79 ++++++---------------
+ arch/alpha/kernel/ptrace.c | 32 ++++-----
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/processor.h | 5 --
+ arch/arm/include/asm/ptrace.h | 5 ++
+ arch/arm/include/asm/system.h | 1 -
+ arch/arm/include/asm/thread_info.h | 2 -
+ arch/arm/include/asm/unistd.h | 2 +
+ arch/arm/kernel/calls.S | 2 +-
+ arch/arm/kernel/entry-common.S | 29 ++++++--
+ arch/arm/kernel/process.c | 75 ++++----------------
+ arch/arm/kernel/signal.c | 1 -
+ arch/arm/kernel/sys_arm.c | 63 -----------------
+ arch/avr32/include/asm/Kbuild | 1 +
+ arch/avr32/include/asm/exec.h | 13 ----
+ arch/avr32/include/asm/thread_info.h | 18 ++---
+ arch/avr32/kernel/signal.c | 1 -
+ arch/blackfin/include/asm/thread_info.h | 4 --
+ arch/blackfin/kernel/signal.c | 1 -
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/include/asm/Kbuild | 1 +
+ arch/c6x/include/asm/exec.h | 6 --
+ arch/c6x/include/asm/processor.h | 2 -
+ arch/c6x/include/asm/syscalls.h | 5 --
+ arch/c6x/include/asm/thread_info.h | 1 -
+ arch/c6x/include/asm/unistd.h | 3 +
+ arch/c6x/kernel/asm-offsets.c | 1 -
+ arch/c6x/kernel/entry.S | 56 +++++++--------
+ arch/c6x/kernel/process.c | 72 +++----------------
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/exec.h | 6 --
+ arch/cris/include/asm/thread_info.h | 3 -
+ arch/frv/Kconfig | 1 +
+ arch/frv/include/asm/Kbuild | 2 +
+ arch/frv/include/asm/exec.h | 17 -----
+ arch/frv/include/asm/processor.h | 9 +--
+ arch/frv/include/asm/ptrace.h | 1 +
+ arch/frv/include/asm/thread_info.h | 3 -
+ arch/frv/include/asm/unistd.h | 2 +
+ arch/frv/kernel/Makefile | 4 +-
+ arch/frv/kernel/entry.S | 13 ++++
+ arch/frv/kernel/frv_ksyms.c | 1 -
+ arch/frv/kernel/kernel_execve.S | 33 ---------
+ arch/frv/kernel/kernel_thread.S | 77 ---------------------
+ arch/frv/kernel/process.c | 66 +++++++-----------
+ arch/frv/kernel/signal.c | 9 ---
+ arch/h8300/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/exec.h | 6 --
+ arch/h8300/include/asm/thread_info.h | 7 +-
+ arch/h8300/kernel/signal.c | 1 -
+ arch/hexagon/include/asm/thread_info.h | 5 --
+ arch/hexagon/kernel/signal.c | 1 -
+ arch/hexagon/kernel/syscall.c | 1 -
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/exec.h | 14 ----
+ arch/ia64/include/asm/thread_info.h | 2 -
+ arch/ia64/kernel/signal.c | 8 ---
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/exec.h | 14 ----
+ arch/m32r/include/asm/thread_info.h | 9 +--
+ arch/m32r/kernel/signal.c | 3 -
+ arch/m68k/Kconfig | 1 +
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/m68k/include/asm/exec.h | 6 --
+ arch/m68k/include/asm/processor.h | 25 ++++---
+ arch/m68k/include/asm/ptrace.h | 2 +
+ arch/m68k/include/asm/unistd.h | 2 +
+ arch/m68k/kernel/entry.S | 16 +++++
+ arch/m68k/kernel/process.c | 104 +++++++---------------------
+ arch/m68k/kernel/sys_m68k.c | 17 -----
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/exec.h | 14 ----
+ arch/microblaze/include/asm/thread_info.h | 3 +-
+ arch/microblaze/kernel/signal.c | 7 +-
+ arch/mips/include/asm/thread_info.h | 3 -
+ arch/mn10300/Kconfig | 1 +
+ arch/mn10300/include/asm/Kbuild | 1 +
+ arch/mn10300/include/asm/exec.h | 16 -----
+ arch/mn10300/include/asm/frame.inc | 2 +-
+ arch/mn10300/include/asm/processor.h | 18 +----
+ arch/mn10300/include/asm/ptrace.h | 1 +
+ arch/mn10300/include/asm/thread_info.h | 3 +-
+ arch/mn10300/include/asm/unistd.h | 2 +
+ arch/mn10300/kernel/Makefile | 4 +-
+ arch/mn10300/kernel/entry.S | 18 +++++
+ arch/mn10300/kernel/internal.h | 6 +-
+ arch/mn10300/kernel/kernel_execve.S | 37 ----------
+ arch/mn10300/kernel/kthread.S | 31 ---------
+ arch/mn10300/kernel/process.c | 91 +++++++-----------------
+ arch/mn10300/kernel/signal.c | 13 ----
+ arch/openrisc/include/asm/thread_info.h | 3 +-
+ arch/parisc/hpux/gate.S | 2 +-
+ arch/parisc/include/asm/Kbuild | 1 +
+ arch/parisc/include/asm/exec.h | 6 --
+ arch/parisc/include/asm/thread_info.h | 5 +-
+ arch/parisc/kernel/signal.c | 45 ++++--------
+ arch/parisc/kernel/syscall.S | 9 +--
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/processor.h | 3 -
+ arch/powerpc/include/asm/ptrace.h | 2 +
+ arch/powerpc/include/asm/syscalls.h | 3 -
+ arch/powerpc/include/asm/thread_info.h | 2 +
+ arch/powerpc/include/asm/unistd.h | 2 +
+ arch/powerpc/kernel/entry_32.S | 16 +++++
+ arch/powerpc/kernel/entry_64.S | 16 +++++
+ arch/powerpc/kernel/misc.S | 7 --
+ arch/powerpc/kernel/misc_32.S | 33 ---------
+ arch/powerpc/kernel/misc_64.S | 34 ---------
+ arch/powerpc/kernel/ppc_ksyms.c | 1 -
+ arch/powerpc/kernel/process.c | 59 ++++++++--------
+ arch/powerpc/kernel/signal_32.c | 1 -
+ arch/powerpc/kernel/sys_ppc32.c | 22 ------
+ arch/s390/Kconfig | 1 +
+ arch/s390/include/asm/processor.h | 4 +-
+ arch/s390/include/asm/thread_info.h | 4 --
+ arch/s390/include/asm/unistd.h | 2 +
+ arch/s390/kernel/compat_linux.c | 26 -------
+ arch/s390/kernel/compat_linux.h | 2 -
+ arch/s390/kernel/compat_wrapper.S | 2 +-
+ arch/s390/kernel/entry.S | 51 ++++++--------
+ arch/s390/kernel/entry.h | 3 -
+ arch/s390/kernel/entry64.S | 50 ++++++--------
+ arch/s390/kernel/process.c | 107 +++++++++--------------------
+ arch/score/include/asm/thread_info.h | 4 --
+ arch/score/kernel/signal.c | 1 +
+ arch/sh/include/asm/Kbuild | 1 +
+ arch/sh/include/asm/exec.h | 10 ---
+ arch/sh/include/asm/thread_info.h | 3 +
+ arch/sh/kernel/signal_32.c | 1 -
+ arch/sh/kernel/signal_64.c | 1 -
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/exec.h | 6 --
+ arch/sparc/include/asm/thread_info_32.h | 3 +-
+ arch/sparc/include/asm/thread_info_64.h | 3 +
+ arch/tile/include/asm/Kbuild | 1 +
+ arch/tile/include/asm/exec.h | 20 ------
+ arch/tile/kernel/compat_signal.c | 9 ---
+ arch/tile/kernel/signal.c | 12 +---
+ arch/um/include/asm/processor-generic.h | 2 -
+ arch/um/include/asm/thread_info.h | 3 -
+ arch/um/kernel/exec.c | 25 +------
+ arch/um/kernel/internal.h | 1 -
+ arch/um/kernel/process.c | 17 +----
+ arch/um/kernel/syscall.c | 17 -----
+ arch/unicore32/include/asm/Kbuild | 1 +
+ arch/unicore32/include/asm/exec.h | 15 ----
+ arch/unicore32/include/asm/thread_info.h | 4 +-
+ arch/unicore32/kernel/entry.S | 2 -
+ arch/unicore32/kernel/signal.c | 1 -
+ arch/unicore32/kernel/sys.c | 1 -
+ arch/x86/Kconfig | 1 +
+ arch/x86/ia32/ia32entry.S | 2 +-
+ arch/x86/ia32/sys_ia32.c | 15 ----
+ arch/x86/include/asm/processor.h | 5 --
+ arch/x86/include/asm/sys_ia32.h | 2 -
+ arch/x86/include/asm/syscalls.h | 2 +-
+ arch/x86/include/asm/thread_info.h | 2 -
+ arch/x86/include/asm/unistd.h | 2 +
+ arch/x86/kernel/Makefile | 2 +-
+ arch/x86/kernel/asm-offsets.c | 3 +
+ arch/x86/kernel/entry_32.S | 43 +++++++-----
+ arch/x86/kernel/entry_64.S | 74 +++++++-------------
+ arch/x86/kernel/process.c | 65 ------------------
+ arch/x86/kernel/process_32.c | 37 ++++++++--
+ arch/x86/kernel/process_64.c | 35 ++++++----
+ arch/x86/kernel/signal.c | 4 --
+ arch/x86/kernel/sys_i386_32.c | 40 -----------
+ arch/x86/kernel/vm86_32.c | 6 +-
+ arch/x86/syscalls/syscall_32.tbl | 2 +-
+ arch/x86/um/Kconfig | 1 +
+ arch/x86/um/sys_call_table_32.c | 1 -
+ arch/xtensa/include/asm/Kbuild | 1 +
+ arch/xtensa/include/asm/exec.h | 14 ----
+ arch/xtensa/include/asm/thread_info.h | 5 --
+ arch/xtensa/kernel/signal.c | 4 --
+ fs/binfmt_elf.c | 1 -
+ fs/binfmt_elf_fdpic.c | 1 -
+ fs/exec.c | 61 ++++++++++++++--
+ include/linux/binfmts.h | 6 ++
+ include/linux/compat.h | 8 ++-
+ include/linux/ptrace.h | 4 ++
+ include/linux/sched.h | 3 +
+ kernel/fork.c | 13 +++-
+ kernel/sched/core.c | 2 +-
+ 193 files changed, 733 insertions(+), 1779 deletions(-)
+ delete mode 100644 arch/alpha/include/asm/exec.h
+ delete mode 100644 arch/avr32/include/asm/exec.h
+ delete mode 100644 arch/c6x/include/asm/exec.h
+ delete mode 100644 arch/cris/include/asm/exec.h
+ delete mode 100644 arch/frv/include/asm/exec.h
+ delete mode 100644 arch/frv/kernel/kernel_execve.S
+ delete mode 100644 arch/frv/kernel/kernel_thread.S
+ delete mode 100644 arch/h8300/include/asm/exec.h
+ delete mode 100644 arch/ia64/include/asm/exec.h
+ delete mode 100644 arch/m32r/include/asm/exec.h
+ delete mode 100644 arch/m68k/include/asm/exec.h
+ delete mode 100644 arch/microblaze/include/asm/exec.h
+ delete mode 100644 arch/mn10300/include/asm/exec.h
+ delete mode 100644 arch/mn10300/kernel/kernel_execve.S
+ delete mode 100644 arch/mn10300/kernel/kthread.S
+ delete mode 100644 arch/parisc/include/asm/exec.h
+ delete mode 100644 arch/sh/include/asm/exec.h
+ delete mode 100644 arch/sparc/include/asm/exec.h
+ delete mode 100644 arch/tile/include/asm/exec.h
+ delete mode 100644 arch/um/kernel/internal.h
+ delete mode 100644 arch/unicore32/include/asm/exec.h
+ delete mode 100644 arch/x86/kernel/sys_i386_32.c
+ delete mode 100644 arch/xtensa/include/asm/exec.h
+Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
+$ git merge clk/clk-next
+Already up-to-date.
+Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
+$ git merge random/dev
+Already up-to-date.
+Merging scsi-post-merge/merge-base:master ()
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/akpm/master:akpm
+From ../next
+ * [new branch] akpm/master -> akpm
+$ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base
+From ../next
+ * [new branch] akpm/base -> akpm-base
+$ git checkout akpm
+Switched to branch 'akpm'
+$ git rebase --onto master akpm-base
+First, rewinding head to replay your work on top of it...
+Applying: CRIS: Fix I/O macros
+Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
+Applying: vfs: d_obtain_alias() needs to use "/" as default name.
+Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
+Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
+Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
+Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
+Applying: acpi_memhotplug.c: remove memory info from list before freeing it
+Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
+Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
+Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
+Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
+Applying: x86 numa: don't check if node is NUMA_NO_NODE
+Applying: arch/x86/tools/insn_sanity.c: identify source of messages
+Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
+Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
+Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
+Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
+Applying: timeconst.pl: remove deprecated defined(@array)
+Applying: time: don't inline EXPORT_SYMBOL functions
+Applying: compiler-gcc4.h: correct verion check for __compiletime_error
+Applying: h8300: select generic atomic64_t support
+Applying: readahead: fault retry breaks mmap file read random detection
+Applying: cciss: cleanup bitops usage
+Applying: cciss: use check_signature()
+Applying: block: store partition_meta_info.uuid as a string
+Applying: init: reduce PARTUUID min length to 1 from 36
+Applying: block: partition: msdos: provide UUIDs for partitions
+Applying: drbd: use copy_highpage
+Applying: vfs: increment iversion when a file is truncated
+Applying: fs: change return values from -EACCES to -EPERM
+Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
+Applying: mm/page_alloc.c: remove duplicate check
+Applying: mm: remove __GFP_NO_KSWAPD
+Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines
+Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn
+Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix
+Applying: mm, x86, pat: rework linear pfn-mmap tracking
+Applying: mm: introduce arch-specific vma flag VM_ARCH_1
+Applying: mm: kill vma flag VM_INSERTPAGE
+Applying: mm: kill vma flag VM_CAN_NONLINEAR
+Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
+Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
+Applying: mm: prepare VM_DONTDUMP for using in drivers
+Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
+Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix
+Applying: mm: fix nonuniform page status when writing new file with small buffer
+Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix
+Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix
+Applying: mm/mmap.c: replace find_vma_prepare() with clearer find_vma_links()
+Applying: mm-mmapc-replace-find_vma_prepare-with-clearer-find_vma_links fix
+Applying: mm: compaction: update comment in try_to_compact_pages
+Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures
+Applying: mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix
+Applying: mm: compaction: capture a suitable high-order page immediately when it is made available
+Applying: Revert "mm: mempolicy: Let vma_merge and vma_split handle vma->vm_policy linkages"
+Applying: mempolicy: remove mempolicy sharing
+Applying: mempolicy: fix a race in shared_policy_replace()
+Applying: mempolicy: fix refcount leak in mpol_set_shared_policy()
+Applying: mempolicy: fix a memory corruption by refcount imbalance in alloc_pages_vma()
+Applying: mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma-v2
+Applying: mm: mmu_notifier: fix inconsistent memory between secondary MMU and host
+Applying: mm-mmu_notifier-fix-inconsistent-memory-between-secondary-mmu-and-host-fix
+Applying: mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
+Applying: mm/mmu_notifier: init notifier if necessary
+Applying: mm/mmu_notifier: init notifier if necessary
+Applying: mm/vmscan: fix error number for failed kthread
+Applying: mm: hugetlb: add arch hook for clearing page flags before entering pool
+Applying: mm: adjust final #endif position in mm/internal.h
+Applying: thp: fix the count of THP_COLLAPSE_ALLOC
+Applying: thp: remove unnecessary check in start_khugepaged
+Applying: thp: move khugepaged_mutex out of khugepaged
+Applying: thp: remove unnecessary khugepaged_thread check
+Applying: thp: remove wake_up_interruptible in the exit path
+Applying: thp: remove some code depend on CONFIG_NUMA
+Applying: thp: merge page pre-alloc in khugepaged_loop into khugepaged_do_scan
+Applying: thp: release page in page pre-alloc path
+Applying: thp: introduce khugepaged_prealloc_page and khugepaged_alloc_page
+Applying: thp: remove khugepaged_loop
+Applying: thp: use khugepaged_enabled to remove duplicate code
+Applying: thp: remove unnecessary set_recommended_min_free_kbytes
+Applying: mm: fix potential anon_vma locking issue in mprotect()
+Applying: thp, x86: introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE
+Applying: thp: remove assumptions on pgtable_t type
+Applying: thp: introduce pmdp_invalidate()
+Applying: thp: make MADV_HUGEPAGE check for mm->def_flags
+Applying: thp, s390: thp splitting backend for s390
+Applying: thp, s390: thp pagetable pre-allocation for s390
+Applying: thp, s390: disable thp for kvm host on s390
+Applying: thp, s390: architecture backend for thp on s390
+Applying: thp, s390: add missing earlyclobber to inline assembly
+Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
+Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
+Applying: rbtree: empty nodes have no color
+Applying: rbtree-empty-nodes-have-no-color-fix
+Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
+Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
+Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
+Applying: rbtree: performance and correctness test
+Applying: rbtree-performance-and-correctness-test-fix
+Applying: rbtree: break out of rb_insert_color loop after tree rotation
+Applying: rbtree: adjust root color in rb_insert_color() only when necessary
+Applying: rbtree: low level optimizations in rb_insert_color()
+Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
+Applying: perf tools: fix build for another rbtree.c change
+Applying: rbtree: optimize case selection logic in __rb_erase_color()
+Applying: rbtree: low level optimizations in __rb_erase_color()
+Applying: rbtree: coding style adjustments
+Applying: rbtree: optimize fetching of sibling node
+Applying: rbtree test: fix sparse warning about 64-bit constant
+Applying: rbtree: add __rb_change_child() helper function
+Applying: rbtree: place easiest case first in rb_erase()
+Applying: rbtree: handle 1-child recoloring in rb_erase() instead of rb_erase_color()
+Applying: rbtree: low level optimizations in rb_erase()
+Applying: rbtree: augmented rbtree test
+Applying: rbtree: faster augmented rbtree manipulation
+Applying: rbtree: remove prior augmented rbtree implementation
+Applying: rbtree: add RB_DECLARE_CALLBACKS() macro
+Applying: rbtree: add prio tree and interval tree tests
+Applying: mm: replace vma prio_tree with an interval tree
+Applying: kmemleak: use rbtree instead of prio tree
+Applying: prio_tree: remove
+Applying: rbtree: move augmented rbtree functionality to rbtree_augmented.h
+Applying: mm: interval tree updates
+Applying: mm anon rmap: remove anon_vma_moveto_tail
+Applying: mm anon rmap: replace same_anon_vma linked list with an interval tree.
+Applying: mm rmap: remove vma_address check for address inside vma
+Applying: mm: add CONFIG_DEBUG_VM_RB build option
+Applying: mm anon rmap: in mremap, set the new vma's position before anon_vma_clone()
+Applying: mm: avoid taking rmap locks in move_ptes()
+Applying: memory-hotplug: build zonelists when offlining pages
+Applying: mm: mmu_notifier: make the mmu_notifier srcu static
+Applying: mm: cma: discard clean pages during contiguous allocation instead of migration
+Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix
+Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix-fix
+Applying: mm: fix tracing in free_pcppages_bulk()
+Applying: mm-fix-tracing-in-free_pcppages_bulk-fix
+Applying: cma: fix counting of isolated pages
+Applying: cma: count free CMA pages
+Applying: cma-count-free-cma-pages-fix
+Applying: cma: fix watermark checking
+Applying: cma: fix watermark checking cleanup
+Applying: mm: page_alloc: use get_freepage_migratetype() instead of page_private()
+Applying: mm: remain migratetype in freed page
+Applying: memory-hotplug: bug fix race between isolation and allocation
+Applying: memory-hotplug: fix pages missed by race rather than failing
+Applying: memory-hotplug-fix-pages-missed-by-race-rather-than-failng-fix
+Applying: atomic: implement generic atomic_dec_if_positive()
+Applying: atomic-implement-generic-atomic_dec_if_positive-fix
+Applying: swap: add a simple detector for inappropriate swapin readahead
+Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
+Applying: mm/memblock: reduce overhead in binary search
+Applying: mm/memblock: use existing interface to set nid
+Applying: mm/memblock: cleanup early_node_map[] related comments
+Applying: mm: compaction: abort compaction loop if lock is contended or run too long
+Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix
+Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix-2
+Applying: mm: compaction: move fatal signal check out of compact_checklock_irqsave
+Applying: mm: compaction: Update try_to_compact_pages()kerneldoc comment
+Applying: mm: compaction: acquire the zone->lru_lock as late as possible
+Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix
+Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix-fix
+Applying: mm: compaction: acquire the zone->lock as late as possible
+Applying: mm: compaction: iron out isolate_freepages_block() and isolate_freepages_range()
+Applying: Revert "mm: have order > 0 compaction start off where it left"
+Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated
+Applying: mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated-fix
+Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated -fix2
+Applying: mm: compaction: Restart compaction from near where it left off
+Applying: mm: compaction: Restart compaction from near where it left off -fix
+Applying: mm: compaction: clear PG_migrate_skip based on compaction and reclaim activity
+Applying: mm/hugetlb.c: remove duplicate inclusion of header file
+Applying: mm/page_alloc: refactor out __alloc_contig_migrate_alloc()
+Applying: mm-page_alloc-refactor-out-__alloc_contig_migrate_alloc-checkpatch-fixes
+Applying: memory-hotplug: don't replace lowmem pages with highmem
+Applying: thp: khugepaged_prealloc_page() forgot to reset the page alloc indicator
+Applying: mm: thp: fix the pmd_clear() arguments in pmdp_get_and_clear()
+Applying: mm: thp: fix the update_mmu_cache() last argument passing in mm/huge_memory.c
+Applying: mm: enable CONFIG_COMPACTION by default
+Applying: mm: fix-up zone present pages
+Applying: memcg: trivial fixes for Documentation/cgroups/memory.txt
+Applying: memcg: cleanup kmem tcp ifdefs
+Applying: memcg: move mem_cgroup_is_root upwards
+Applying: mm: fix invalidate_complete_page2() lock ordering
+Applying: mm: remove vma arg from page_evictable
+Applying: mm: use clear_page_mlock() in page_remove_rmap()
+Applying: mm: remove free_page_mlock
+Applying: mm, numa: reclaim from all nodes within reclaim distance
+Applying: mm-numa-reclaim-from-all-nodes-within-reclaim-distance-fix
+Applying: mm, numa: reclaim from all nodes within reclaim distance fix fix
+Applying: memory.txt: remove stray information
+Applying: mm: thp: fix pmd_present for split_huge_page and PROT_NONE with THP
+Applying: hugetlb: do not use vma_hugecache_offset() for vma_prio_tree_foreach
+Applying: mm: move all mmu notifier invocations to be done outside the PT lock
+Applying: mm: wrap calls to set_pte_at_notify with invalidate_range_start and invalidate_range_end
+Applying: mm: call invalidate_range_end in do_wp_page even for zero pages
+Applying: Revert 0def08e3 because check_range can't fail in migrate_to_node with
+Applying: mm: enhance comment and bug check
+Applying: memory-hotplug: fix zone stat mismatch
+Applying: mm: remove unevictable_pgs_mlockfreed
+Applying: KSM: numa awareness sysfs knob
+Applying: mm/memory.c: fix typo in comment
+Applying: fs/fs-writeback.c: remove unneccesary parameter of __writeback_single_inode()
+Applying: kpageflags: fix wrong KPF_THP on non-huge compound pages
+Applying: CMA: migrate mlocked pages
+Applying: cma: decrease cc.nr_migratepages after reclaiming pagelist
+Applying: score: select generic atomic64_t support
+Using index info to reconstruct a base tree...
+M arch/score/Kconfig
+Falling back to patching base and 3-way merge...
+Auto-merging arch/score/Kconfig
+Applying: pwm_backlight: add device tree support for Low Threshold Brightness
+Applying: pwm_backlight-add-device-tree-support-for-low-threshold-brightness-fix
+Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
+Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
+Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
+Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
+Applying: rtc_sysfs_show_hctosys(): display 0 if resume failed
+Using index info to reconstruct a base tree...
+M drivers/rtc/class.c
+M drivers/rtc/hctosys.c
+M drivers/rtc/rtc-sysfs.c
+M include/linux/rtc.h
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/rtc/class.c
+Applying: hfsplus: add on-disk layout declarations related to attributes tree
+Applying: hfsplus: add functionality of manipulating by records in attributes tree
+Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
+Applying: hfsplus: add support of manipulation by attributes file
+Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
+Applying: hfsplus: code style fixes - reworked support of extended attributes
+Applying: ipc/sem.c: alternatives to preempt_disable()
+Applying: prio_tree: fix fs/block_dev.c for removal of prio_tree
+Applying: fs/block_dev.c:set_blocksize(): use mapping_mapped()
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 2a89e3c...b9d227b akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (b9d227b fs/block_dev.c:set_blocksize(): use mapping_mapped())
+$ git merge --no-ff akpm/master
+Removing mm/prio_tree.c
+Removing lib/prio_tree.c
+Removing include/linux/prio_tree.h
+Removing Documentation/prio_tree.txt
+Removing Documentation/memory.txt
+Merge made by the 'recursive' strategy.
+ Documentation/00-INDEX | 2 -
+ Documentation/cgroups/memory.txt | 90 +--
+ .../bindings/video/backlight/pwm-backlight.txt | 10 +
+ Documentation/memory.txt | 33 -
+ Documentation/prio_tree.txt | 107 ----
+ Documentation/rbtree.txt | 209 +++++--
+ Documentation/vm/ksm.txt | 7 +
+ Documentation/vm/unevictable-lru.txt | 14 +-
+ arch/Kconfig | 3 +
+ arch/alpha/kernel/pci-sysfs.c | 2 +-
+ arch/arm/mm/fault-armv.c | 3 +-
+ arch/arm/mm/fault.c | 1 +
+ arch/arm/mm/flush.c | 3 +-
+ arch/avr32/mm/fault.c | 1 +
+ arch/cris/include/asm/io.h | 39 +-
+ arch/cris/mm/fault.c | 1 +
+ arch/h8300/Kconfig | 1 +
+ arch/hexagon/mm/vm_fault.c | 1 +
+ arch/ia64/include/asm/hugetlb.h | 4 +
+ arch/ia64/kernel/perfmon.c | 2 +-
+ arch/ia64/mm/fault.c | 1 +
+ arch/ia64/mm/init.c | 4 +-
+ arch/m68k/mm/fault.c | 1 +
+ arch/microblaze/include/asm/atomic.h | 1 +
+ arch/microblaze/mm/fault.c | 1 +
+ arch/mips/include/asm/hugetlb.h | 4 +
+ arch/mips/mm/fault.c | 1 +
+ arch/openrisc/mm/fault.c | 1 +
+ arch/parisc/kernel/cache.c | 3 +-
+ arch/powerpc/include/asm/atomic.h | 1 +
+ arch/powerpc/include/asm/hugetlb.h | 4 +
+ arch/powerpc/kvm/book3s_hv.c | 2 +-
+ arch/powerpc/mm/fault.c | 1 +
+ arch/powerpc/oprofile/cell/spu_task_sync.c | 15 +-
+ arch/s390/include/asm/hugetlb.h | 19 +-
+ arch/s390/include/asm/pgtable.h | 209 +++++++
+ arch/s390/include/asm/setup.h | 5 +-
+ arch/s390/include/asm/tlb.h | 1 +
+ arch/s390/kernel/early.c | 2 +
+ arch/s390/mm/fault.c | 1 +
+ arch/s390/mm/gup.c | 11 +-
+ arch/s390/mm/pgtable.c | 108 ++++
+ arch/score/Kconfig | 3 +-
+ arch/sh/include/asm/hugetlb.h | 6 +
+ arch/sh/mm/fault.c | 1 +
+ arch/sparc/include/asm/hugetlb.h | 4 +
+ arch/sparc/kernel/pci.c | 2 +-
+ arch/sparc/mm/fault_32.c | 1 +
+ arch/sparc/mm/fault_64.c | 1 +
+ arch/tile/include/asm/hugetlb.h | 4 +
+ arch/tile/mm/elf.c | 19 +-
+ arch/tile/mm/fault.c | 1 +
+ arch/um/kernel/trap.c | 1 +
+ arch/unicore32/kernel/process.c | 2 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/atomic.h | 24 -
+ arch/x86/include/asm/hugetlb.h | 4 +
+ arch/x86/include/asm/pgtable.h | 11 +-
+ arch/x86/include/asm/uv/uv.h | 2 +-
+ arch/x86/kernel/acpi/boot.c | 7 +-
+ arch/x86/mm/fault.c | 1 +
+ arch/x86/mm/hugetlbpage.c | 3 +-
+ arch/x86/mm/numa.c | 3 +-
+ arch/x86/mm/pat.c | 87 ++-
+ arch/x86/mm/pat_rbtree.c | 34 +-
+ arch/x86/platform/iris/iris.c | 67 +-
+ arch/x86/platform/uv/tlb_uv.c | 10 +-
+ arch/x86/tools/insn_sanity.c | 10 +-
+ arch/x86/xen/mmu.c | 3 +-
+ arch/xtensa/mm/fault.c | 1 +
+ block/genhd.c | 8 +-
+ block/partitions/efi.c | 7 +-
+ block/partitions/msdos.c | 21 +-
+ drivers/acpi/acpi_memhotplug.c | 123 +++-
+ drivers/block/cciss.c | 21 +-
+ drivers/block/drbd/drbd_bitmap.c | 7 +-
+ drivers/char/mbcs.c | 2 +-
+ drivers/char/mem.c | 2 +-
+ drivers/char/mspec.c | 2 +-
+ drivers/firmware/dmi_scan.c | 78 ++-
+ drivers/gpu/drm/drm_gem.c | 2 +-
+ drivers/gpu/drm/drm_vm.c | 10 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 3 +-
+ drivers/gpu/drm/i915/intel_pm.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +-
+ drivers/gpu/drm/udl/udl_fb.c | 2 +-
+ drivers/infiniband/hw/ehca/ehca_uverbs.c | 4 +-
+ drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
+ drivers/media/pci/meye/meye.c | 2 +-
+ drivers/media/platform/omap/omap_vout.c | 2 +-
+ drivers/media/platform/vino.c | 2 +-
+ drivers/media/usb/sn9c102/sn9c102_core.c | 3 +-
+ drivers/media/usb/usbvision/usbvision-video.c | 3 +-
+ drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +-
+ drivers/media/v4l2-core/videobuf-vmalloc.c | 2 +-
+ drivers/media/v4l2-core/videobuf2-memops.c | 2 +-
+ drivers/misc/carma/carma-fpga.c | 2 -
+ drivers/misc/sgi-gru/grufile.c | 5 +-
+ drivers/mtd/mtdchar.c | 2 +-
+ drivers/mtd/mtdcore.c | 6 +-
+ drivers/oprofile/buffer_sync.c | 17 +-
+ drivers/pcmcia/cs.c | 37 +-
+ drivers/rtc/class.c | 3 +-
+ drivers/scsi/sg.c | 2 +-
+ drivers/staging/android/ashmem.c | 1 -
+ drivers/staging/omapdrm/omap_gem_dmabuf.c | 2 +-
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 +-
+ drivers/uio/uio.c | 4 +-
+ drivers/usb/mon/mon_bin.c | 2 +-
+ drivers/vfio/pci/vfio_pci.c | 2 +-
+ drivers/video/68328fb.c | 2 +-
+ drivers/video/aty/atyfb_base.c | 3 +-
+ drivers/video/backlight/pwm_bl.c | 5 +
+ drivers/video/fb-puv3.c | 3 +-
+ drivers/video/fb_defio.c | 2 +-
+ drivers/video/fbmem.c | 3 +-
+ drivers/video/gbefb.c | 2 +-
+ drivers/video/omap2/omapfb/omapfb-main.c | 2 +-
+ drivers/video/sbuslib.c | 5 +-
+ drivers/video/smscufx.c | 1 -
+ drivers/video/udlfb.c | 1 -
+ drivers/video/vermilion/vermilion.c | 1 -
+ drivers/video/vfb.c | 1 -
+ drivers/xen/gntalloc.c | 2 +-
+ drivers/xen/gntdev.c | 2 +-
+ drivers/xen/privcmd.c | 3 +-
+ fs/9p/vfs_file.c | 1 +
+ fs/attr.c | 5 +
+ fs/autofs4/root.c | 2 +-
+ fs/binfmt_elf.c | 4 +-
+ fs/binfmt_elf_fdpic.c | 2 +-
+ fs/block_dev.c | 11 +-
+ fs/btrfs/file.c | 2 +-
+ fs/ceph/addr.c | 2 +-
+ fs/cifs/file.c | 1 +
+ fs/dcache.c | 2 +-
+ fs/debugfs/inode.c | 1 -
+ fs/dlm/config.c | 2 +-
+ fs/exec.c | 2 +-
+ fs/ext4/file.c | 2 +-
+ fs/fs-writeback.c | 7 +-
+ fs/fuse/file.c | 1 +
+ fs/gfs2/file.c | 2 +-
+ fs/gfs2/sys.c | 18 +-
+ fs/hfsplus/Makefile | 3 +-
+ fs/hfsplus/attributes.c | 399 ++++++++++++
+ fs/hfsplus/bfind.c | 79 ++-
+ fs/hfsplus/bnode.c | 6 +-
+ fs/hfsplus/brec.c | 23 +-
+ fs/hfsplus/btree.c | 8 +
+ fs/hfsplus/catalog.c | 36 +-
+ fs/hfsplus/dir.c | 6 +-
+ fs/hfsplus/extents.c | 4 +-
+ fs/hfsplus/hfsplus_fs.h | 41 +-
+ fs/hfsplus/hfsplus_raw.h | 68 +-
+ fs/hfsplus/inode.c | 13 +
+ fs/hfsplus/ioctl.c | 542 ++++++++++++++--
+ fs/hfsplus/super.c | 33 +-
+ fs/hfsplus/unicode.c | 7 +-
+ fs/hugetlbfs/inode.c | 11 +-
+ fs/inode.c | 2 +-
+ fs/jffs2/readinode.c | 13 +-
+ fs/ncpfs/ioctl.c | 2 +-
+ fs/nfs/file.c | 1 +
+ fs/nilfs2/file.c | 2 +-
+ fs/ocfs2/mmap.c | 2 +-
+ fs/proc/base.c | 6 +-
+ fs/proc/page.c | 8 +-
+ fs/proc/proc_sysctl.c | 5 +-
+ fs/proc/task_mmu.c | 2 +-
+ fs/ubifs/file.c | 1 +
+ fs/udf/file.c | 2 +-
+ fs/xfs/xfs_file.c | 2 +-
+ include/asm-generic/pgtable.h | 72 ++-
+ include/linux/atomic.h | 25 +
+ include/linux/compaction.h | 19 +-
+ include/linux/compiler-gcc4.h | 2 +-
+ include/linux/fs.h | 8 +-
+ include/linux/genhd.h | 8 +-
+ include/linux/gfp.h | 5 +-
+ include/linux/huge_mm.h | 1 -
+ include/linux/interval_tree.h | 27 +
+ include/linux/interval_tree_generic.h | 191 ++++++
+ include/linux/memblock.h | 3 +-
+ include/linux/mempolicy.h | 4 +-
+ include/linux/mm.h | 140 +++--
+ include/linux/mm_types.h | 16 +-
+ include/linux/mman.h | 1 -
+ include/linux/mmu_notifier.h | 60 +-
+ include/linux/mmzone.h | 10 +-
+ include/linux/page-isolation.h | 7 +-
+ include/linux/pageblock-flags.h | 19 +-
+ include/linux/prio_tree.h | 120 ----
+ include/linux/rbtree.h | 119 +---
+ include/linux/rbtree_augmented.h | 223 +++++++
+ include/linux/rmap.h | 39 +-
+ include/linux/swap.h | 2 +-
+ include/linux/timerqueue.h | 2 +-
+ include/linux/vm_event_item.h | 1 -
+ include/linux/vmstat.h | 12 +
+ include/trace/events/gfpflags.h | 1 -
+ init/do_mounts.c | 61 +-
+ init/main.c | 2 -
+ ipc/mqueue.c | 3 -
+ ipc/sem.c | 250 +++++---
+ kernel/auditsc.c | 13 +-
+ kernel/events/core.c | 2 +-
+ kernel/events/uprobes.c | 8 +-
+ kernel/fork.c | 31 +-
+ kernel/time.c | 4 +-
+ kernel/timeconst.pl | 2 +-
+ lib/Kconfig.debug | 22 +
+ lib/Makefile | 7 +-
+ lib/interval_tree.c | 10 +
+ lib/interval_tree_test_main.c | 105 ++++
+ lib/prio_tree.c | 466 --------------
+ lib/rbtree.c | 656 +++++++++++---------
+ lib/rbtree_test.c | 234 +++++++
+ mm/Kconfig | 3 +-
+ mm/Makefile | 4 +-
+ mm/bootmem.c | 10 +-
+ mm/compaction.c | 559 ++++++++++++-----
+ mm/filemap.c | 6 +-
+ mm/filemap_xip.c | 10 +-
+ mm/fremap.c | 16 +-
+ mm/huge_memory.c | 423 ++++++-------
+ mm/hugetlb.c | 29 +-
+ mm/internal.h | 94 ++-
+ mm/interval_tree.c | 112 ++++
+ mm/kmemleak.c | 101 +--
+ mm/ksm.c | 175 +++++-
+ mm/madvise.c | 8 +-
+ mm/memblock.c | 7 +-
+ mm/memcontrol.c | 22 +-
+ mm/memory-failure.c | 8 +-
+ mm/memory.c | 116 ++--
+ mm/memory_hotplug.c | 29 +-
+ mm/mempolicy.c | 148 +++--
+ mm/mlock.c | 18 +-
+ mm/mmap.c | 207 +++---
+ mm/mmu_notifier.c | 103 +--
+ mm/mremap.c | 73 ++-
+ mm/nobootmem.c | 5 +-
+ mm/nommu.c | 33 +-
+ mm/page_alloc.c | 285 ++++++---
+ mm/page_isolation.c | 43 +-
+ mm/pgtable-generic.c | 50 ++
+ mm/prio_tree.c | 208 -------
+ mm/rmap.c | 162 ++---
+ mm/shmem.c | 4 +-
+ mm/swap.c | 13 +-
+ mm/swap_state.c | 6 +
+ mm/truncate.c | 3 -
+ mm/vmalloc.c | 3 +-
+ mm/vmscan.c | 111 +++-
+ mm/vmstat.c | 14 +-
+ net/ceph/osd_client.c | 1 -
+ security/selinux/netnode.c | 3 +-
+ security/selinux/selinuxfs.c | 2 +-
+ security/tomoyo/util.c | 9 +-
+ sound/core/pcm_native.c | 6 +-
+ sound/usb/usx2y/us122l.c | 2 +-
+ sound/usb/usx2y/usX2Yhwdep.c | 2 +-
+ sound/usb/usx2y/usx2yhwdeppcm.c | 2 +-
+ tools/perf/util/include/linux/rbtree.h | 1 +
+ 267 files changed, 5956 insertions(+), 3390 deletions(-)
+ delete mode 100644 Documentation/memory.txt
+ delete mode 100644 Documentation/prio_tree.txt
+ create mode 100644 fs/hfsplus/attributes.c
+ create mode 100644 include/linux/interval_tree.h
+ create mode 100644 include/linux/interval_tree_generic.h
+ delete mode 100644 include/linux/prio_tree.h
+ create mode 100644 include/linux/rbtree_augmented.h
+ create mode 100644 lib/interval_tree.c
+ create mode 100644 lib/interval_tree_test_main.c
+ delete mode 100644 lib/prio_tree.c
+ create mode 100644 lib/rbtree_test.c
+ create mode 100644 mm/interval_tree.c
+ delete mode 100644 mm/prio_tree.c
+$ git revert 2237ba05b684
+[master 5cbfea1] Revert "rtc_sysfs_show_hctosys(): display 0 if resume failed"
+ 1 file changed, 1 insertion(+), 2 deletions(-)
projects / karo-tx-linux.git / commitdiff