]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit01a00c0296f33749fba29263b97ae34f72bee87e
treeaa5c7ca13aeaf92d1e08cbc71da52e6a5a27336d
parenta46c15238c6398a6c631949ab59d439a1c270154
parent0daefd7941a50d6ca03dc677a46da3c1f79ba4bd
Merge branch 'quilt/device-mapper'

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