Merge branch 'for-linus' of git://github.com/chrismason/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Sep 2011 21:22:55 +0000 (14:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Sep 2011 21:22:55 +0000 (14:22 -0700)
commit43a964a7bfd15a2ed9e801c18dd327565edb4e62
tree59d7e93ad2d0ca89acd95937cbe2ad96cc3786e9
parent80976804f501303a34a76e925119393722596dca
parent0a7a0519d1789f3a222849421dbe91b6bddb88f5
Merge branch 'for-linus' of git://github.com/chrismason/linux

* 'for-linus' of git://github.com/chrismason/linux:
  Btrfs: reserve sufficient space for ioctl clone