merge to: https://github.com/RobertCNelson/linux/commit/9b6d351a75dae25430383b29a3764ae7921f6c47

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