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

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