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

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