merge to: https://github.com/RobertCNelson/linux/commit/6792dfe383dd20ed270da198aa0676bac47245b4

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