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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 06:01:21 +0000 (16:01 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 06:01:21 +0000 (16:01 +1000)
commit	5231e7c235a64f01facac5763d9da14f28f1042b
tree	50a169e63678fecfa1e417351a091fb6e22900c2	tree \| snapshot
parent	da18c0a0e74c66b2df196c2cf446a4378b4c0247	commit \| diff
parent	abc04d5af7e33da8968b3edba067e0597d74dea2	commit \| diff

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

Conflicts:
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/sun4i-a10.dtsi
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-mxs/Kconfig
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/clock-r8a7778.c
arch/arm/mach-u300/timer.c
drivers/clocksource/dw_apb_timer_of.c
drivers/tty/serial/xilinx_uartps.c
drivers/usb/Kconfig
drivers/usb/phy/phy-rcar-usb.c
include/linux/mfd/davinci_voicecodec.h
include/linux/serial_sci.h
include/uapi/linux/serial_core.h

79 files changed:

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am335x-bone.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am335x-evm.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am335x-evmsk.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am33xx.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/bcm11351.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx28.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap3-devkit8000.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/sun4i-a10-cubieboard.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/sun4i-a10.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/omap2plus_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/cp15.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mm-imx3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_device.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/timer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7740.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7778.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7779.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear/spear6xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/timer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/include/plat/cpu-freq-core.h	diff1 \|	diff2 \|	blob \| history
drivers/clk/samsung/clk-exynos5250.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/clksrc-dbx500-prcmu.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/dw_apb_timer_of.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/nomadik-mtu.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Kconfig.arm	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/s3c24xx-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/cpuidle/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/crypto/ux500/cryp/cryp_core.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-rcar.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/exynos4-is/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/davinci_mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pci/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-coh901.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-exynos.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-nomadik.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-samsung.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-u300.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/sh-pfc/core.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/ab8500.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/thermal/exynos_thermal.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/samsung.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/sh-sci.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/xilinx_uartps.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-platform.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/ux500.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/ux500_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/s3c2410_wdt.c	diff1 \|	diff2 \|	blob \| history
include/linux/dw_apb_timer.h	diff1 \|	diff2 \|	blob \| history
include/linux/mfd/davinci_voicecodec.h	diff1 \|	diff2 \|	blob \| history
include/linux/serial_sci.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/serial_core.h	diff1 \|	diff2 \|	blob \| history
sound/soc/ux500/ux500_pcm.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am335x-bone.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am335x-evm.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am335x-evmsk.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am33xx.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/bcm11351.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx28.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap3-devkit8000.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/sun4i-a10-cubieboard.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/sun4i-a10.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/omap2plus_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/cp15.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mm-imx3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_device.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/timer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7740.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7778.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7779.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear/spear6xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/timer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/include/plat/cpu-freq-core.h	diff1 \|	diff2 \|	blob \| history
drivers/clk/samsung/clk-exynos5250.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/clksrc-dbx500-prcmu.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/dw_apb_timer_of.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/nomadik-mtu.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Kconfig.arm	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/s3c24xx-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/cpuidle/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/crypto/ux500/cryp/cryp_core.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-rcar.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/exynos4-is/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/davinci_mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pci/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-coh901.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-exynos.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-nomadik.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-samsung.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-u300.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/sh-pfc/core.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/ab8500.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/thermal/exynos_thermal.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/samsung.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/sh-sci.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/xilinx_uartps.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-platform.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/ux500.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/ux500_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/s3c2410_wdt.c	diff1 \|	diff2 \|	blob \| history
include/linux/dw_apb_timer.h	diff1 \|	diff2 \|	blob \| history
include/linux/mfd/davinci_voicecodec.h	diff1 \|	diff2 \|	blob \| history
include/linux/serial_sci.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/serial_core.h	diff1 \|	diff2 \|	blob \| history
sound/soc/ux500/ux500_pcm.c	diff1 \|	diff2 \|	blob \| history