merge to: https://github.com/RobertCNelson/linux/commit/8efdf2b759409f85953b84d52a14ea4d39c80474

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