Sync up with Linus' tree to be able to apply Cesar's patch
against newer version of the code.
Signed-off-by: NJiri Kosina <jkosina@suse.cz>