| commit | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Fri Dec 31 10:52:05 2010 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Fri Dec 31 10:52:05 2010 +0900 |
| tree | fa15cd1b385898f01ead4649712f6e4fbcd055cd | |
| parent | 0ae9a22b45b9e9d0f6058e5257b2daf48036dd35 [diff] | |
| parent | fa353e9f409340cefc7650854065cbcea85c347d [diff] |
Merge branch 'next-s5pv310' into for-next Conflicts: arch/arm/mach-s5pv310/Kconfig arch/arm/mach-s5pv310/Makefile arch/arm/mach-s5pv310/mach-smdkc210.c arch/arm/mach-s5pv310/mach-smdkv310.c arch/arm/plat-samsung/include/plat/devs.h