merge to: https://github.com/RobertCNelson/linux/commit/2e67c56248b776c0a546925c796cdb167ee4d7a0

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