Merge branch 'sunxi/fixes-for-3.18' into HEAD
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 17 Nov 2014 16:02:46 +0000 (17:02 +0100)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 17 Nov 2014 16:02:46 +0000 (17:02 +0100)

Trivial merge