Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 19 Dec 2013 14:08:03 +0000 (15:08 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 19 Dec 2013 14:08:32 +0000 (15:08 +0100)
Sync with Linus' tree to be able to apply fixes on top of newer things
in tree (efi-stub).

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

Trivial merge