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

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