summaryrefslogtreecommitdiffstats
path: root/drivers/firmware/edd.c
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-08-08 12:25:28 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-08-08 12:26:15 +0200
commita131bc185528331451a93db6c50a7d2070376a61 (patch)
tree18cccd206d4835ee8df147ac3b0c0e30cc00680d /drivers/firmware/edd.c
parentintel-iommu: Unify hardware and software passthrough support (diff)
parentMerge git://git.infradead.org/~dwmw2/iommu-2.6.31 (diff)
downloadlinux-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/firmware/edd.c')
0 files changed, 0 insertions, 0 deletions