lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into core/percpu

Browse Source 
Conflicts:
	kernel/irq/handle.c
This commit is contained in:
Ingo Molnar
2009-01-30 18:23:30 +01:00
parent dba3d36b2f f2257b70b0
commit c43e0e46ad
293 changed files with 10178 additions and 4209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/parisc/kernel/pci-dma.c
View File

@@ -2,7 +2,7 @@
** PARISC 1.1 Dynamic DMA mapping support.
** This implementation is for PA-RISC platforms that do not support
** I/O TLBs (aka DMA address translation hardware).
** See Documentation/DMA-mapping.txt for interface definitions.
** See Documentation/PCI/PCI-DMA-mapping.txt for interface definitions.
**
** (c) Copyright 1999,2000 Hewlett-Packard Company
** (c) Copyright 2000 Grant Grundler