merge to: https://github.com/RobertCNelson/linux/commit/60b5f90d0fac7585f1a43ccdad06787b97eda0ab

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