git.karo-electronics.de Git - karo-tx-linux.git/commit

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
Documentation/devicetree/bindings/usb/platform-uhci.txt
arch/arm/include/asm/timex.h
arch/arm/mach-davinci/davinci.h
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-shmobile/include/mach/common.h
arch/arm/mach-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-vt8500/bv07.c
arch/arm/mach-vt8500/devices-vt8500.c
arch/arm/mach-vt8500/devices-wm8505.c
arch/arm/mach-vt8500/devices.c
arch/arm/mach-vt8500/devices.h
arch/arm/mach-vt8500/wm8505_7in.c
drivers/clocksource/Makefile
drivers/dma/mmp_tdma.c
drivers/i2c/busses/i2c-omap.c
drivers/input/keyboard/omap-keypad.c
drivers/mfd/db8500-prcmu.c
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/omap.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
drivers/spi/spi-davinci.c
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/video/msm/mddi.c
drivers/video/msm/mdp.c
drivers/video/msm/mdp_hw.h
drivers/video/omap/lcd_ams_delta.c
drivers/video/omap2/dss/dispc.c
drivers/w1/masters/omap_hdq.c
sound/soc/omap/igep0020.c
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-pcm.c
sound/soc/omap/omap3beagle.c
sound/soc/omap/omap3evm.c
sound/soc/omap/overo.c

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 27 Sep 2012 05:50:56 +0000 (15:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 27 Sep 2012 05:50:56 +0000 (15:50 +1000)
commit	87c26d7e8ea0ea6af265481c01f1d455ebd552ae
tree	04a69b3674c4beff0319979a3af05cc2554e74ec	tree \| snapshot
parent	28175198d267ca8b28dd1d1e663a7541d00544ac	commit \| diff
parent	143fe301012e71ccbd9ad3aa6c6b880a05ca3eca	commit \| diff

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx51.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx53.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx6q.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/kzm9g_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/timex.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/bios32.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9261_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9263.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9263_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9rl_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/davinci.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm355.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm365.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/include/mach/da8xx.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-nuri.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-origen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdk4x12.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clk-imx51-imx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_cp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mxs.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-devkit8000.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-igep0020.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-rx51-peripherals.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-zoom-peripherals.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/mcbsp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/usb-host.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/sharpsl_pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/stargate2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/mach-smdk2416.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-anw6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-hmt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-mini6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-ncp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-real6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6440.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6450.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pc100/mach-smdkc100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-goni.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkv210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-kzm9g.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/r8a7779.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/pm-rmobile.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/pm-sh7372.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/smp-emev2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/pcie.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/i2c.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/cache-l2x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/devices-common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/plat/usb.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/clock.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/fsl_msi.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/clk/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/crypto/ux500/hash/hash_core.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ep93xx_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/imx-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/imx-sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/mmp_tdma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/omap-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/tegra20-apb-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-pxa.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-davinci.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-imx.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/omap-keypad.c	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/s3c2410_ts.c	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/davinci/vpbe_venc.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/omap/omap_vout.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/omap3isp/isp.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/s5p-fimc/mipi-csis.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/soc_camera/mx1_camera.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/soc_camera/mx2_camera.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/soc_camera/mx3_camera.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/soc_camera/pxa_camera.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/davinci_mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/mxcmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/pxamci.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-esdhc-imx.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-tegra.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/ams-delta.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/davinci_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/mxc_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/orion_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pxa3xx_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/s3c2410.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/mscan/mpc5xxx_can.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/remoteproc/omap_remoteproc.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-davinci.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-omap2-mcspi.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-s3c64xx.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-tegra.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/dsp-clock.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/tiomap3430.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/tiomap3430_pwr.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/wdt.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/rmgr/drv_interface.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/imx.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/pxa27x_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/s3c2410_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-mxc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-s5p.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-nxp.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-pxa27x.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/da8xx.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/tusb6010_omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/ux500_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/otg/isp1301_omap.c	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/da8xx-fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/ep93xx-fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/imxfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mddi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mddi_client_nt35399.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp_hw.h	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dispc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/omapfb/omapfb-main.c	diff1 \|	diff2 \|	blob \| history
include/linux/i2c/twl.h	diff1 \|	diff2 \|	blob \| history
include/linux/leds.h	diff1 \|	diff2 \|	blob \| history
include/linux/mfd/twl6040.h	diff1 \|	diff2 \|	blob \| history
include/linux/mod_devicetable.h	diff1 \|	diff2 \|	blob \| history
include/linux/platform_data/asoc-ti-mcbsp.h	diff1 \|	diff2 \|	blob \| history
include/linux/platform_data/remoteproc-omap.h	diff1 \|	diff2 \|	blob \| history
sound/soc/cirrus/ep93xx-ac97.c	diff1 \|	diff2 \|	blob \| history
sound/soc/cirrus/ep93xx-i2s.c	diff1 \|	diff2 \|	blob \| history
sound/soc/cirrus/ep93xx-pcm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/imx-pcm-dma.c	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/imx-ssi.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/am3517evm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/mcbsp.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-abe-twl6040.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-mcbsp.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-mcpdm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-pcm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/zoom2.c	diff1 \|	diff2 \|	blob \| history