merge to: https://github.com/RobertCNelson/linux/commit/10ec34fcb100412ab186c141a9c3557d1270effd

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