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

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