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

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