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

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