merge to: https://github.com/RobertCNelson/linux/commit/527d1511310a89650000081869260394e20c7013

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