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

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