merge to: https://github.com/RobertCNelson/linux/commit/3af4977ed66918aea468feadc2f00715f1e2c4af

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