merge to: https://github.com/RobertCNelson/linux/commit/9538e10086bd1301fe915683b1ba0a1de66d7483

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