tree 0058693cc9e70b7461dae551f8a19aff2efd13ca
parent f16f84937d769c893492160b1a8c3672e3992beb
parent e657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6
author Jiri Kosina <jkosina@suse.cz> 1351448932 +0100
committer Jiri Kosina <jkosina@suse.cz> 1351448959 +0100

Merge branch 'master' into for-next

Sync up with Linus' tree to be able to apply Cesar's patch
against newer version of the code.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>