merge to: https://github.com/RobertCNelson/linux/commit/4b97280675f45c1650ee4e388bd711ecbb18c4b4

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