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

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