merge to: https://github.com/RobertCNelson/linux/commit/110e4308f89fed7be824abb681d962eacc0bc319

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