From: Olof Johansson 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-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=88cf9c5e494795a53ec360d0b38f483a6d4e508f 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 --- 88cf9c5e494795a53ec360d0b38f483a6d4e508f