diff options
| author | Ingo Molnar | 2009-02-24 21:52:45 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-02-24 21:52:45 +0100 |
| commit | 0edcf8d6926f4038443dbc24e319530177ca0353 (patch) | |
| tree | 6010af62f73d01ab673d5106f310eaf4f4228e32 /kernel/dma.c | |
| parent | 87b203079ed949de52f0d92aeae20e5e0116c12f (diff) | |
| parent | 40150d37be7f7949b2ec07d511244da856647d84 (diff) | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Conflicts:
arch/x86/include/asm/pgtable.h
Diffstat (limited to 'kernel/dma.c')
0 files changed, 0 insertions, 0 deletions