merge to: https://github.com/RobertCNelson/linux/commit/ece8e0b2f9c980e5511fe8db2d68c6f1859b9d83

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