Merge tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux into next/dt
authorOlof Johansson <olof@lixom.net>
Thu, 18 Apr 2013 16:26:44 +0000 (09:26 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 18 Apr 2013 16:27:46 +0000 (09:27 -0700)
commit88cf9c5e494795a53ec360d0b38f483a6d4e508f
treea5e62ef870083ad32ab9046153997b4c3badd236
parentda0851fe3a8ebc416ab61ce50ef2fb3c3d7375c9
parent92fd6e066a4ecdf161710afe6460bc372899ae5f
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>