]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c795ce5 1ca30da)
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)
Conflicts:
drivers/md/dm-thin.c
drivers/md/dm.c

1  2 
drivers/md/dm-mpath.c patch | diff1 | diff2 | blob | history

diff --cc drivers/md/dm-mpath.c
Simple merge
Linux kernel for KaRo TX COM modules