]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 15 Jan 2014 23:17:34 +0000 (10:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 15 Jan 2014 23:17:34 +0000 (10:17 +1100)
commit5d64e4a2f6e6caaa83390a473a5c4cb4e4fc6d22
tree914f060bcd30976b058c6f4e07164ed69c567096
parent94158b14a758144ffa52bc9e15c9c64f10a478ef
parentfb54a12a810e778b329ec8c0cda606c14a77c68e
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig.debug
MAINTAINERS
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/boot/compressed/Makefile
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/mach-at91/setup.c
arch/arm/mach-ux500/setup.h
drivers/clk/samsung/clk-exynos4.c
drivers/pinctrl/pinctrl-baytrail.c