merge to: https://github.com/RobertCNelson/linux/commit/45f7fdc2ffb9d5af4dab593843e89da70d1259e3

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