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

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