merge to: https://github.com/RobertCNelson/linux/commit/31dab719fa50cf56d56d3dc25980fecd336f6ca8

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