diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-14 14:24:33 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-14 14:24:33 +1000 |
| commit | 82f5890a1eb08322ebb2285a5fb37e49946f3159 (patch) | |
| tree | 0abe6e24406b2b90b235bba6d9165dcffaee78bd /drivers/pnp | |
| parent | 0fd0ab531986ea8318343e0bf3437584f097ce43 (diff) | |
| parent | c416daa98a584596df21ee2c26fac6579ee58f57 (diff) | |
Merge commit 'dwmw2-iommu/master'
Conflicts:
drivers/pci/intel-iommu.c
drivers/pci/intr_remapping.c
Diffstat (limited to 'drivers/pnp')
0 files changed, 0 insertions, 0 deletions