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

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