| commit | af2519fb2298cdf7540082c36f4d8c66bbff103f | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jan 16 10:09:10 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jan 16 10:09:10 2009 +0100 |
| tree | 1d290d28d42d42f9e693457762c4008988628060 | |
| parent | 961d7d0ee5150e0197cc81c2a8884ecb230276e2 [diff] | |
| parent | 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 [diff] |
Merge branch 'linus' into core/iommu Conflicts: arch/ia64/include/asm/dma-mapping.h arch/ia64/include/asm/machvec.h arch/ia64/include/asm/machvec_sn2.h