merge to: https://github.com/RobertCNelson/linux/commit/3e75c6de1ac33fe3500f44573d9212dc82c99f59

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