]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43aa7ac 5dc6416)
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 patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/ioctl.c
Simple merge
XArray, radix tree and IDR