Merge branch 'next/cleanup' into next/dt
authorKevin Hilman <khilman@linaro.org>
Tue, 10 Dec 2013 17:59:21 +0000 (09:59 -0800)
committerKevin Hilman <khilman@linaro.org>
Tue, 10 Dec 2013 17:59:21 +0000 (09:59 -0800)

Trivial merge