merge to: https://github.com/RobertCNelson/linux/commit/03d11a0e458d7008192585124e4c3313c2829046

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