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

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