merge to: https://github.com/RobertCNelson/linux/commit/82e13c71bc655b6dc7110da4e164079dadb44892

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