merge to: https://github.com/RobertCNelson/linux/commit/4907cdca7210c5895311bddcf05a4c85b67d8566

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