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

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