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

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