]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 01:59:12 +0000 (11:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 01:59:12 +0000 (11:59 +1000)
commitadcea7142460e30d4999fae58dba4f011ca64f8d
treee68800c43cc284cc526df80471a4812f8dc159de
parent06789d828ebcd6b38621186eac1abd6675a6017a
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