9b9f610ba16fa116
parent 9537a48ed4b9e4b738943d6da0a0fd4278adf905
parent 7c730ccdc1188b97f5c8cb690906242c7ed75c22
author Ingo Molnar <mingo@elte.hu> 1238277950 +0100
committer Ingo Molnar <mingo@elte.hu> 1238277950 +0100

Merge branch 'linus' into core/iommu

Conflicts:
	arch/x86/Kconfig
0:^ߘ1x