]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/device-mapper'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 03:39:48 +0000 (13:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 03:39:48 +0000 (13:39 +1000)
commit11d115953d8afc525a992b349f97905a6dac255e
tree6bca61836388a1a522f22d098940b5f986ff914a
parentc795ce50a6b12aa8b09813295090cd197c95a567
parent1ca30da686a067c79b09146eb519e37a355f211c
Merge branch 'quilt/device-mapper'

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