Signed-off-by: Bryan Hundven <bryanhundven@gmail.com> [yann.morin.1998@free.fr: propagate patchset from 4.4.6] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>