merge to: https://github.com/RobertCNelson/linux/commit/903a9f77d1d00c8621bc37afd959ac45a4b3ebec

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