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

Simple merge