merge to: https://github.com/RobertCNelson/linux/commit/90804ed61f24712975fa12f8a1fc12cd46ef7d59

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