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

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