]> git.karo-electronics.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 01:10:25 +0000 (11:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 01:10:25 +0000 (11:10 +1000)
commit7166e1d29fce853a00e71397060917e10e6fe5e4
tree190fde72f1c72e93c34f4f02872dfdd9bd1fc389
parente968f032f4420d45d8780b2e75e873ab9184976d
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