merge to: https://github.com/RobertCNelson/linux/commit/39de65aa2c3eee901db020a4f1396998e09602a3

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