merge to: https://github.com/RobertCNelson/linux/commit/04919afb85c8f007b7326c4da5eb61c52e91b9c7

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