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

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