From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 16 Jan 2012 20:26:31 +0000 (-0500)
Subject: Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration
X-Git-Tag: v3.3-rc1~26^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9785dbdf265ddc47d5c88267d89a97648c0dc14b;p=users%2Fhch%2Fblock.git

Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration
---

9785dbdf265ddc47d5c88267d89a97648c0dc14b