Merge branch 'next/dt2' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:37:01 +0000 (14:37 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:37:01 +0000 (14:37 -0700)
Conflicts:
arch/arm/mach-exynos/clock-exynos5.c


Trivial merge