]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/device-mapper'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:03:10 +0000 (12:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:03:10 +0000 (12:03 +1100)
commit7d66f7b9400ba169c94ddc15ef0d25547caccc46
tree14c9d3e4f505cb957728d8419f240ddd4f04b5a3
parent792d5c573c4406290b888513165ec9e4f62f414e
parent1ca30da686a067c79b09146eb519e37a355f211c
Merge branch 'quilt/device-mapper'

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