tree 59d7e93ad2d0ca89acd95937cbe2ad96cc3786e9
parent 80976804f501303a34a76e925119393722596dca
parent 0a7a0519d1789f3a222849421dbe91b6bddb88f5
author Linus Torvalds <torvalds@linux-foundation.org> 1316553775 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1316553775 -0700

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