]> 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>
Mon, 6 Jan 2014 23:56:45 +0000 (10:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 23:56:45 +0000 (10:56 +1100)
commit8758e1bb6137304f74c833a2ba85929a1f85d534
tree544ae59a634f7ce18c3171b2abbda5550056b5f6
parent12cda54d18a160cee80cd46d7a04c5dda336ce7b
parent5e59dd41794cc302003872fc1cd1306dc2111832
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