merge to: https://github.com/RobertCNelson/linux/commit/894e552cfaa3389f934dc68180bac692aebcf26b

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