merge to: https://github.com/RobertCNelson/linux/commit/30b02c4b2a1eb6b6ca83e31c6b65f63076a03c5b

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