Merge remote-tracking branch 'remotes/josef/for-chris' into btrfs-next-stable
commitafd582ac8f10382002a72b4d17d9c2db328ed8b8
authorDavid Sterba <dsterba@suse.cz>
Mon, 24 Oct 2011 12:47:57 +0000 (24 14:47 +0200)
committerDavid Sterba <dsterba@suse.cz>
Mon, 24 Oct 2011 12:47:57 +0000 (24 14:47 +0200)
tree91246c1296c06cc0d5add8d10452e7fb110ed920
parentc3b92c8787367a8bb53d57d9789b558f1295cc96
parent016fc6a63e465d5b94e4028f6d05d9703e195428
Merge remote-tracking branch 'remotes/josef/for-chris' into btrfs-next-stable
fs/btrfs/ioctl.c