Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 20 Feb 2014 13:54:28 +0000 (14:54 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 20 Feb 2014 13:54:28 +0000 (14:54 +0100)

Trivial merge