diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-15 15:43:24 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-15 15:43:24 +1000 |
commit | 70c6575c49d2fbd24f0c505e50f562c37d4789c9 (patch) | |
tree | 283c9368bbde25f1230c7ba8ef5105494515eb4d /lib/locking-selftest-softirq.h | |
parent | 5768a265aa9788f24c58613228cb78cb65bae920 (diff) | |
parent | cb4dd99ef1d4ad8a7a110d485455a0676576dae1 (diff) |
Merge commit 'ia64/test'
Conflicts:
arch/ia64/kernel/mca.c
arch/ia64/mm/tlb.c
Diffstat (limited to 'lib/locking-selftest-softirq.h')
0 files changed, 0 insertions, 0 deletions