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

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