]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 5 Jan 2014 23:20:29 +0000 (10:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 5 Jan 2014 23:20:29 +0000 (10:20 +1100)
commitc86f181e30fac5cd85ed7b5625bf731140fa1b1e
treeaf584817dfe54356f9c25d0b4b4144c7fa70a4e2
parent26dc8ec23f133df36b27eb02c933a1304f02687a
parent12043f0aeb548052664d2f14dde108f70e70781f
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/mach-at91/setup.c
arch/arm/mach-ux500/setup.h
drivers/pinctrl/pinctrl-baytrail.c