Merge branch 'hotfixes-20111024/josef/for-chris' into btrfs-next-stable
authorDavid Sterba <dsterba@suse.cz>
Mon, 24 Oct 2011 12:47:58 +0000 (14:47 +0200)
committerDavid Sterba <dsterba@suse.cz>
Mon, 24 Oct 2011 12:47:58 +0000 (14:47 +0200)

Trivial merge