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)
commita81d3b1ba2f5faae28ba7a092c7598673fa02ac2
tree8301fefcd9f3d45be9d0030456a86bca5b9ff061
parentafd582ac8f10382002a72b4d17d9c2db328ed8b8
parentf9d9ef62cd3ecbd6cbb7957a253c1e81f69d5586
Merge branch 'hotfixes-20111024/josef/for-chris' into btrfs-next-stable
fs/btrfs/ioctl.c