merge to: https://github.com/RobertCNelson/linux/commit/53c6de50262a8edd6932bb59a32db7b9d92f8d67

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