merge to: https://github.com/RobertCNelson/linux/commit/81bbadc6374773c5d8737de29386d3abdef909f4

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