diff options
| author | Ingo Molnar | 2008-07-18 21:13:20 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-18 21:13:20 +0200 |
| commit | f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c (patch) | |
| tree | c5643fcdc884a8d0bfc3f1bc28039cab7394e5bc /arch/powerpc/boot/cuboot-824x.c | |
| parent | x86: use generic per-device dma coherent allocator (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c.tar.gz kernel-qcow2-linux-f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c.tar.xz kernel-qcow2-linux-f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c.zip | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/boot/cuboot-824x.c')
0 files changed, 0 insertions, 0 deletions