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

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