]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:16:41 +0000 (13:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:16:41 +0000 (13:16 +1100)
commitc02ffce82ed80d5dcc04180a6bf42c1125fb06ac
treefdab04db41da2ad067d4f369b44e7b4c0a0be143
parent4f69aab7cdb41527f48461cea8878b0abf6fc444
parentad97e8e1265f2c8e7583a01eef6dc41a55155ba5
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile
arch/arm/mach-exynos4/Kconfig