Merge branch 'btrfs-3.0' into for-linus
Chris Mason [Sun, 18 Sep 2011 14:31:44 +0000 (10:31 -0400)]
1  2 
fs/btrfs/inode.c
fs/btrfs/ioctl.c

Simple merge
Simple merge