merge to: https://github.com/RobertCNelson/linux/commit/16874b2cb867d3eb63ed838f2847143e11556708

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