Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux...
authorGrant Likely <grant.likely@linaro.org>
Tue, 7 Oct 2014 10:13:53 +0000 (11:13 +0100)
committerGrant Likely <grant.likely@linaro.org>
Tue, 7 Oct 2014 10:13:53 +0000 (11:13 +0100)

Trivial merge