merge to: https://github.com/RobertCNelson/linux/commit/4a54e5e517cdc0044c9c9542e53736500a9391dc

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