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

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