]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'linus' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 22:05:50 +0000 (23:05 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 22:05:50 +0000 (23:05 +0100)
commitb0d44c0dbbd52effb731b1c0af9afd56215c48de
tree3237c0087d91a5390aed05689b9f610ba16fa116
parent9537a48ed4b9e4b738943d6da0a0fd4278adf905
parent7c730ccdc1188b97f5c8cb690906242c7ed75c22
Merge branch 'linus' into core/iommu

Conflicts:
arch/x86/Kconfig
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/kernel/Makefile
lib/Kconfig.debug
lib/Makefile