Russell King 586893ebc4 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable ... Conflicts: arch/arm/Kconfig arch/arm/mach-exynos4/mach-nuri.c		2011-05-25 21:47:48 +01:00
..
plat	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable	2011-05-25 21:47:48 +01:00