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

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