merge to: https://github.com/RobertCNelson/linux/commit/7a262d2ed9fa42fad8c4f243f8025580b58cf2f6

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