diff options
author | Linus Torvalds | 2008-04-22 00:38:43 +0200 |
---|---|---|
committer | Linus Torvalds | 2008-04-22 00:38:43 +0200 |
commit | 5f033bb9bc5cb3bb37a79e3ef131f50ecdcb72b0 (patch) | |
tree | 16c6fdc3fab80d88ea4d8fd7eb302097f97c062c /sound/core/pcm_compat.c | |
parent | Merge branch 'ro-bind.b6' of git://git.kernel.org/pub/scm/linux/kernel/git/vi... (diff) | |
parent | x86: UV startup of slave cpus (diff) | |
download | kernel-qcow2-linux-5f033bb9bc5cb3bb37a79e3ef131f50ecdcb72b0.tar.gz kernel-qcow2-linux-5f033bb9bc5cb3bb37a79e3ef131f50ecdcb72b0.tar.xz kernel-qcow2-linux-5f033bb9bc5cb3bb37a79e3ef131f50ecdcb72b0.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (77 commits)
x86: UV startup of slave cpus
x86: integrate pci-dma.c
x86: don't do dma if mask is NULL.
x86: return conditional to mmu
x86: remove kludge from x86_64
x86: unify gfp masks
x86: retry allocation if failed
x86: don't try to allocate from DMA zone at first
x86: use a fallback dev for i386
x86: use numa allocation function in i386
x86: remove virt_to_bus in pci-dma_64.c
x86: adjust dma_free_coherent for i386
x86: move bad_dma_address
x86: isolate coherent mapping functions
x86: move dma_coherent functions to pci-dma.c
x86: merge iommu initialization parameters
x86: merge dma_supported
x86: move pci fixup to pci-dma.c
x86: move x86_64-specific to common code.
x86: move initialization functions to pci-dma.c
...
Diffstat (limited to 'sound/core/pcm_compat.c')
0 files changed, 0 insertions, 0 deletions