diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 12:25:28 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 12:26:15 +0200 |
| commit | a131bc185528331451a93db6c50a7d2070376a61 (patch) | |
| tree | 18cccd206d4835ee8df147ac3b0c0e30cc00680d /drivers/edac/edac_pci.c | |
| parent | intel-iommu: Unify hardware and software passthrough support (diff) | |
| parent | Merge git://git.infradead.org/~dwmw2/iommu-2.6.31 (diff) | |
| download | linux-a131bc185528331451a93db6c50a7d2070376a61.tar.xz linux-a131bc185528331451a93db6c50a7d2070376a61.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
Diffstat (limited to 'drivers/edac/edac_pci.c')
0 files changed, 0 insertions, 0 deletions