Merge branch 'sunxi/drivers-for-3.14' into sunxi/core-for-3.14
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Fri, 22 Nov 2013 20:22:58 +0000 (21:22 +0100)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Fri, 22 Nov 2013 20:22:58 +0000 (21:22 +0100)

Trivial merge