diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-25 10:49:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-25 10:49:46 +1000 |
| commit | e0bef900f5b026aa93d07a37f76d015962082b6c (patch) | |
| tree | 060b38e1a4857cb84ae5e99d9f1fb986a6c2a568 /drivers/infiniband/hw/ehca/ehca_irq.c | |
| parent | ff2458bfe75f15292e5050407a8de4ef1ee5fd0a (diff) | |
| parent | 97c6adf315020b8a387da42ab7b533b71f66190b (diff) | |
Merge commit 'tip-core/auto-core-next'
Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c
arch/x86/xen/mmu.h
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_irq.c')
0 files changed, 0 insertions, 0 deletions