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

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