merge to: https://github.com/RobertCNelson/linux/commit/4f440cd534359f689cb577c68f8491d1eddf0b76

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