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)
* 'for-linus' of git://github.com/chrismason/linux:
  Btrfs: reserve sufficient space for ioctl clone


Trivial merge