merge to: https://github.com/RobertCNelson/linux/commit/496322bc91e35007ed754184dcd447a02b6dd685

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