diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-20 21:16:53 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-20 21:19:36 +0200 |
| commit | b364776ad1208a71f0c53578c84619a395412a8d (patch) | |
| tree | d6050e5db6298095324ccb8af7d477684485d52e /include/asm-parisc/hw_irq.h | |
| parent | fs/Kconfig: move ext2, ext3, ext4, JBD, JBD2 out (diff) | |
| parent | Admit to maintaining VT-d, for my sins. (diff) | |
| download | linux-b364776ad1208a71f0c53578c84619a395412a8d.tar.xz linux-b364776ad1208a71f0c53578c84619a395412a8d.zip | |
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 'include/asm-parisc/hw_irq.h')
0 files changed, 0 insertions, 0 deletions