]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/device-mapper'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 02:31:50 +0000 (13:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 02:31:50 +0000 (13:31 +1100)
commit632c25c68090f58fcf8263af69ea132f8f9df69b
tree0ac5365016523fdb5c47245f6f892c15d4c4395e
parent98480ea8023a0714d2fe3967f3a95ed64b96142b
parentc0b2b8c36aaa9fe4fbab44bac78db960c7cd255e
Merge branch 'quilt/device-mapper'

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