]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 01:39:38 +0000 (12:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 01:39:38 +0000 (12:39 +1100)
Conflicts:
arch/arm/mach-exynos/clock-exynos5.c


Trivial merge