diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-03 08:25:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 08:25:59 +0100 |
| commit | 6083aa485c86933ee444dc2242270d37ea4664cb (patch) | |
| tree | e2b7b9588bbf18a62bf08fcf3fda812de25cda4d /arch/powerpc/kernel/pci_dn.c | |
| parent | dcb7731a185efbf3d800618d874af99895df5afb (diff) | |
| parent | 93093d099e5dd0c258fd530c12668e828c20df41 (diff) | |
| download | blackbird-op-linux-6083aa485c86933ee444dc2242270d37ea4664cb.tar.gz blackbird-op-linux-6083aa485c86933ee444dc2242270d37ea4664cb.zip | |
Merge branch 'x86/io' into x86/iommu
Merge x86/io into x86/iommu due to a small patch conflict in io.h.
Diffstat (limited to 'arch/powerpc/kernel/pci_dn.c')
0 files changed, 0 insertions, 0 deletions
