Merge branch 'sunxi/dt-for-4.4' into sunxi/for-next
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Fri, 23 Oct 2015 18:07:33 +0000 (20:07 +0200)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Fri, 23 Oct 2015 18:07:33 +0000 (20:07 +0200)

Trivial merge