diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-09-14 14:07:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 14:07:00 +0200 |
| commit | 6e03f99803195e5aaf7f247db31b0d11857ccc35 (patch) | |
| tree | ffd4b1a140854977e984a4390105333845c0e90c /include/linux/console_struct.h | |
| parent | x86: convert dma_alloc_coherent to use is_device_dma_capable (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
Merge branch 'linus' into x86/iommu
Conflicts:
lib/swiotlb.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/console_struct.h')
0 files changed, 0 insertions, 0 deletions