merge to: https://github.com/RobertCNelson/linux/commit/9217cbb8df31c10efc96362227b2ebdbb9fe996c

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