diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:49:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:49:59 +1000 |
| commit | 40defdeda12133674060421979ed42d5bc502965 (patch) | |
| tree | 06ba415b62953754570fb115cd23dafab672ade5 /Documentation/cputopology.txt | |
| parent | f2603c77e8cd7777742da9eb8feea06fbd85c267 (diff) | |
| parent | d8f3de0d2412bb91639cfefc5b3c79dbf3812212 (diff) | |
Merge commit 'pci/linux-next'
Conflicts:
arch/x86/pci/irq.c
include/linux/device.h
Diffstat (limited to 'Documentation/cputopology.txt')
0 files changed, 0 insertions, 0 deletions