merge to: https://github.com/RobertCNelson/linux/commit/fb2af0020a51709ad87ea8055c325d3fbde04158

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