From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 04:17:35 +0000 (+1100)
Subject: Merge branch 'quilt/device-mapper'
X-Git-Tag: next-20111103~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=01a00c02;p=karo-tx-linux.git

Merge branch 'quilt/device-mapper'

Conflicts:
	Documentation/device-mapper/thin-provisioning.txt
---

01a00c0296f33749fba29263b97ae34f72bee87e