merge to: https://github.com/RobertCNelson/linux/commit/79d2d21ee06f3634423d1a45fb6ddfcae59061fd

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