summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-07-23 12:06:48 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-07-23 12:06:51 +1000
commit0f0abf45daaf8ab1ea4bf5c80c068c8ae5a03108 (patch)
tree2dee346159db6f89a1c75cf8fa63feeda4987bbb /arch
parent4882198da95254667a0143fd2ca7bc7aaa060150 (diff)
parent632c4531dd3e25ac5e1d0c96dc5dbcee6f9434a3 (diff)
Merge branch 'quilt/device-mapper'
Conflicts: drivers/md/dm.c
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions