diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 19:46:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 19:46:58 +0100 |
| commit | e33f6635da037ed4d2634ee6bdf5c4d601946c18 (patch) | |
| tree | 443367576b9a2e30eb32c9d1c422206c87e5a1ad /arch/powerpc/kernel/dma_64.c | |
| parent | fb: fix warning: no return statement in function returning non-void (diff) | |
| parent | [SPARC64]: Temporarily remove IOMMU merging code. (diff) | |
| download | linux-e33f6635da037ed4d2634ee6bdf5c4d601946c18.tar.xz linux-e33f6635da037ed4d2634ee6bdf5c4d601946c18.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Temporarily remove IOMMU merging code.
[SPARC64]: Update defconfig.
[SPARC]: Add new timerfd syscall entries.
Diffstat (limited to 'arch/powerpc/kernel/dma_64.c')
0 files changed, 0 insertions, 0 deletions