diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-20 20:16:53 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-20 20:19:36 +0100 |
| commit | b364776ad1208a71f0c53578c84619a395412a8d (patch) | |
| tree | d6050e5db6298095324ccb8af7d477684485d52e /kernel | |
| parent | 6da0b38f4433fb0f24615449d7966471b6e5eae0 (diff) | |
| parent | 6c8909b42fee1be67647bcd2518161a0fa8ca533 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/intel-iommu.c
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions