Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into sunxi/core-for-3.10
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 8 Apr 2013 19:36:54 +0000 (21:36 +0200)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 8 Apr 2013 19:36:54 +0000 (21:36 +0200)

Trivial merge