merge to: https://github.com/RobertCNelson/linux/commit/0e47c969c65e213421450c31043353ebe3c67e0c

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