merge to: https://github.com/RobertCNelson/linux/commit/7505ceaf863590b24a4c0c83b64817d26e0d51e3

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