commit | 0ae9a22b45b9e9d0f6058e5257b2daf48036dd35 | [log] [tgz] |
---|---|---|
author | Kukjin Kim <kgene.kim@samsung.com> | Thu Dec 30 10:52:32 2010 +0900 |
committer | Kukjin Kim <kgene.kim@samsung.com> | Thu Dec 30 10:52:32 2010 +0900 |
tree | 9f7b388ab5eef34f00f4a4c7e476c61cc17d5bdc | |
parent | 5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff [diff] | |
parent | 8f49720d5afb42dc7c0ced2cd94d561fbe9560d9 [diff] |
Merge branch 'next-s5pv210' into for-next-new Conflicts: arch/arm/mach-s5pv210/mach-smdkv210.c