merge to: https://github.com/RobertCNelson/linux/commit/74e1a2a39355b2d3ae8c60c78d8add162c6d7183

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