This one didn't make it for 3.11 due to being applied too close
to release, queue it for 3.12 merge window.
Signed-off-by: NJiri Kosina <jkosina@suse.cz>