merge to: https://github.com/RobertCNelson/linux/commit/d92a333a65a17b8638a0980df4bedf8a262b12f3

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