merge to: https://github.com/RobertCNelson/linux/commit/58d08e3b2c2033354b91467da33deffa06360c28

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