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

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