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

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