merge to: https://github.com/RobertCNelson/linux/commit/5c02c392cd2320e8d612376d6b72b6548a680923

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