merge with: https://git.linaro.org/gitweb?p=people/shawnguo/linux-2.6.git;a=shortlog;h=refs/heads/for-next cf37a61c3df54a11eaaf7a99d346e20e4374ab5c

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>