merge to: https://github.com/RobertCNelson/linux/commit/19d2f8e0fb7bba99cc585d2467e9fa54a84c8557

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