merge to: https://github.com/RobertCNelson/linux/commit/7f0d32e0c1a7a23216a0f2694ec841f60e9dddfd

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