]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:45:11 +0000 (16:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:45:11 +0000 (16:45 +1000)
commita025141a00cb078939d808b62513543997ddde03
treeb22755d513b47e32d86c466c0fceecba4f91a9da
parentd3f1f7b77ff5c893fa5cdfba6719a28b4b132bc1
parentbc40c113fb3fd6f20b45c9b3c04117bc03c35a64
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
drivers/usb/Kconfig
17 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/boot/dts/exynos5440.dtsi
arch/arm/mach-exynos/Kconfig
arch/arm/plat-samsung/pm.c
drivers/clk/samsung/clk-exynos5250.c
drivers/gpio/Kconfig
drivers/media/platform/Kconfig
drivers/media/platform/exynos4-is/Kconfig
drivers/pinctrl/Kconfig
drivers/thermal/exynos_thermal.c
drivers/tty/serial/samsung.c
drivers/usb/host/Kconfig
drivers/watchdog/s3c2410_wdt.c