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

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