merge to: https://github.com/RobertCNelson/linux/commit/26b0332e30c7f93e780aaa054bd84e3437f84354

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