merge to: https://github.com/RobertCNelson/linux/commit/7c6809ff2bd63d4c97ce9e0b94d39d5180842c48

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