merge to: https://github.com/RobertCNelson/linux/commit/21d2271fd0812ebe3716cab0b48356837485a74d

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