merge to: https://github.com/RobertCNelson/linux/commit/963649d735c8b6eb0f97e82c54f02426ff3f1f45

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