From: Olof Johansson <olof@lixom.net>
Date: Thu, 18 Apr 2013 16:26:44 +0000 (-0700)
Subject: Merge tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux into next/dt
X-Git-Tag: v3.10-rc1~124^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88cf9c5e494795a53ec360d0b38f483a6d4e508f;p=platform%2Fkernel%2Flinux-stable.git

Merge tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux into next/dt

From Maxime Ripard:
Fourth round of dt additions for 3.10

There's only one late patch that merge together two clocks that were
already defined in a previous patch.

* tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux:
  ARM: sunxi: unify osc24M_fixed and osc24M

Signed-off-by: Olof Johansson <olof@lixom.net>
---

88cf9c5e494795a53ec360d0b38f483a6d4e508f