| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Mar 28 23:05:50 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Mar 28 23:05:50 2009 +0100 |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 | |
| parent | 9537a48ed4b9e4b738943d6da0a0fd4278adf905 [diff] | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 [diff] |
Merge branch 'linus' into core/iommu Conflicts: arch/x86/Kconfig