| commit | 7b27fa258c8f2670a8c09bbc6c4b2c874d155da2 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:37:01 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:37:01 2012 -0700 |
| tree | eee3e1cbe481ac38614ab621122626bf5248372e | |
| parent | a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5 [diff] | |
| parent | 6fd9b70e1b8f5d715728510b8f6e2566101143f1 [diff] |
Merge branch 'next/dt2' into HEAD Conflicts: arch/arm/mach-exynos/clock-exynos5.c