merge to: https://github.com/RobertCNelson/linux/commit/6d87c225f5d82d29243dc124f1ffcbb0e14ec358

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