Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sun, 28 Oct 2012 18:28:52 +0000 (19:28 +0100)
committerJiri Kosina <jkosina@suse.cz>
Sun, 28 Oct 2012 18:29:19 +0000 (19:29 +0100)
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>

Trivial merge