merge to: https://github.com/RobertCNelson/linux/commit/42a2d923cc349583ebf6fdd52a7d35e1c2f7e6bd

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