| commit | 0ae9a22b45b9e9d0f6058e5257b2daf48036dd35 | |
| author | Kukjin Kim <kgene.kim@samsung.com> | |
| Thu, 30 Dec 2010 01:52:32 +0000 (30 10:52 +0900) | ||
| committer | Kukjin Kim <kgene.kim@samsung.com> | |
| Thu, 30 Dec 2010 01:52:32 +0000 (30 10:52 +0900) | ||
| tree | 9f7b388ab5eef34f00f4a4c7e476c61cc17d5bdc | treesnapshot (tar.gz zip) |
| parent | 5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff | commitdiff |
| parent | 8f49720d5afb42dc7c0ced2cd94d561fbe9560d9 | commitdiff |
Merge branch 'next-s5pv210' into for-next-new
Conflicts:
arch/arm/mach-s5pv210/mach-smdkv210.c
Conflicts:
arch/arm/mach-s5pv210/mach-smdkv210.c
| arch/arm/mach-s5pv210/mach-smdkv210.c | diff1 | diff2 | blobhistory |