| commit | 2520123382e97271e932377c83bca010c265be55 | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Fri Sep 16 17:13:09 2011 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Fri Sep 16 17:13:09 2011 +0900 |
| tree | 1403c6c4ea400be832322cd84acee93cd49076e7 | |
| parent | be4ab3616839c26caf914449de3a22458f53f6e5 [diff] | |
| parent | 699efdd2d34c535f415516e06d3d9f0bed131664 [diff] |
Merge branch 'next-samsung-board-v3.1' into next-samsung-board Conflicts: arch/arm/mach-exynos4/Kconfig