diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-16 21:15:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-16 21:15:18 -0700 |
| commit | 5b58e21a27028a9f0399449d8bc8494fd9d9ff70 (patch) | |
| tree | fba49cc745f791755a7e86d518376a740fd39f0a /arch/ia64/sn/pci/pcibr/pcibr_dma.c | |
| parent | 52ade9b3b97fd3bea42842a056fe0786c28d0555 (diff) | |
| parent | 576fe0bd7e52dce7afb6b9b2450744555b2eb53a (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] optimize pagefaults a little
[IA64] Fix section conflict of ia64_mlogbuf_finish
[IA64] s/scalibility/scalability/
[IA64] kdump on INIT needs multi-nodes sync-up (v.2)
[IA64] wire up {signal,timer,event}fd syscalls
[IA64] spelling fixes: arch/ia64/
Diffstat (limited to 'arch/ia64/sn/pci/pcibr/pcibr_dma.c')
| -rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c index 95af40cb22f..e626e50a938 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c @@ -201,7 +201,7 @@ pcibr_dmatrans_direct32(struct pcidev_info * info, } /* - * Wrapper routine for free'ing DMA maps + * Wrapper routine for freeing DMA maps * DMA mappings for Direct 64 and 32 do not have any DMA maps. */ void |