| commit | 586893ebc42943008010b4c210cfc9167df615e5 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Wed May 25 21:47:48 2011 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Wed May 25 21:47:48 2011 +0100 |
| tree | eec3179235978fba9ca6bfae0799d97c8532ee15 | |
| parent | 014322dac6ae0048c928c6ca2faf0d53194f9d15 [diff] | |
| parent | bd6356bdafc853201168f718f0059fbe11191461 [diff] |
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