Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 May 2010 19:55:31 +0000 (12:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 May 2010 19:55:31 +0000 (12:55 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: check for read permission on src file in the clone ioctl

1  2 
fs/btrfs/ioctl.c

Simple merge