diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:42:45 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:46:43 +1000 |
| commit | c5943c881bfc77b5380f936745bf5f92503d89f5 (patch) | |
| tree | e84e2321bed107100ce838a8293b744b1561a3bd /drivers/pci/setup-bus.c | |
| parent | a33227e05e56835dcf3b20e3958ee3ba625681ff (diff) | |
| parent | f49a759dc124f47373b1b913f1aa9fe491f7a4cf (diff) | |
Merge commit 'x86/auto-x86-next'
Conflicts:
arch/x86/kernel/entry_32.S
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
Diffstat (limited to 'drivers/pci/setup-bus.c')
0 files changed, 0 insertions, 0 deletions