Merge branch 'linux-3.10.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable...
authorAlex Shi <alex.shi@linaro.org>
Sat, 18 Apr 2015 05:36:38 +0000 (13:36 +0800)
committerAlex Shi <alex.shi@linaro.org>
Sat, 18 Apr 2015 05:36:38 +0000 (13:36 +0800)

Trivial merge