merge to: https://github.com/RobertCNelson/linux/commit/00170fdd0846df7cdb5ad421d3a340440f930b8f

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