summaryrefslogtreecommitdiff
path: root/drivers/dma/mv_xor.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-10-12 18:39:44 +0400
committerThomas Gleixner <tglx@linutronix.de>2010-10-12 18:39:53 +0400
commit8ffcfa4e2d96342180e02dfe1230b97778c52d72 (patch)
tree77255a0235022444fe958ab1092fb352e6222b72 /drivers/dma/mv_xor.c
parentb683de2b3cb17bb10fa6fd4af614dc75b5749fe0 (diff)
parentfa47f7e52874683a9659df2f1f143105f676dc0f (diff)
downloadlinux-8ffcfa4e2d96342180e02dfe1230b97778c52d72.tar.xz
Merge branch 'x86/x2apic' into irq/sparseirq
Reason: Avoid conflicts with the x2apic modifications Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/dma/mv_xor.c')
0 files changed, 0 insertions, 0 deletions