merge to: https://github.com/RobertCNelson/linux/commit/7be141d0554921751db103b54e9f794956aa4f65

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