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

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