| commit | f2b7e3c54a304677a1142829fb5913595885379f | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Fri Aug 06 21:34:55 2010 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Fri Aug 06 21:34:55 2010 +0900 |
| tree | 1eb941524c7325672f947dab525d96228b362e20 | |
| parent | 6b8eda04ffdc24b68d379a32358f4f09a425a380 [diff] | |
| parent | 0fdb480e7fb1ecdd4076ddf8b6ab16b0d77406c1 [diff] |
Merge branch 'next-s5p' into for-next Conflicts: arch/arm/mach-s5pv210/mach-aquila.c arch/arm/mach-s5pv210/mach-goni.c