]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 23:36:39 +0000 (09:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 23:36:39 +0000 (09:36 +1000)
commitc02fdb10299a7bd5730df87cd3c2293c574f8696
tree4b8dccec2bcbe6397beba9f6d51d7dd47ae07604
parent6c2abef3c3cbf2aab3cf894e420dfa57ee96277f
parentc471b2bd4969eb618aa30f15cfd9672f431a5207
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/mach-smdkc210.c
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Makefile