merge to: https://github.com/RobertCNelson/linux/commit/d8524ae9d6f492a9c6db9f4d89c5f9b8782fa2d5

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