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

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