From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 03:39:48 +0000 (+1000)
Subject: Merge branch 'quilt/device-mapper'
X-Git-Tag: next-20121003~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=11d115953d8afc525a992b349f97905a6dac255e;p=karo-tx-linux.git

Merge branch 'quilt/device-mapper'

Conflicts:
	drivers/md/dm-thin.c
	drivers/md/dm.c
---

11d115953d8afc525a992b349f97905a6dac255e