From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Oct 2011 06:20:40 +0000 (+1200)
Subject: Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b2f9452bd5234d573898bbda52a410b154f8f510;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux

* 'btrfs-3.0' of git://github.com/chrismason/linux:
  Btrfs: make sure not to defrag extents past i_size
  Btrfs: fix recursive auto-defrag
---

b2f9452bd5234d573898bbda52a410b154f8f510