]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/device-mapper'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 04:17:35 +0000 (15:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 04:17:35 +0000 (15:17 +1100)
Conflicts:
Documentation/device-mapper/thin-provisioning.txt


Trivial merge