Merge branch 'for_linus' into for_next
authorJan Kara <jack@suse.cz>
Fri, 30 Jan 2015 09:16:33 +0000 (10:16 +0100)
committerJan Kara <jack@suse.cz>
Fri, 30 Jan 2015 09:16:33 +0000 (10:16 +0100)

Trivial merge