Merge branch 'linus' into tracing/hw-branch-tracing
commitdb8862eafe8a5d030a3b02e81b8bb47447c315e3
authorIngo Molnar <mingo@elte.hu>
Wed, 24 Dec 2008 20:08:26 +0000 (24 21:08 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 24 Dec 2008 20:08:26 +0000 (24 21:08 +0100)
tree073ea7b46809bf804134cbf008a593413c02a99c
parentc5dee6177f4bd2095aab7d9be9f6ebdddd6deee9
parentc20137fc5329eaf24093fc48c52608dc66be8e5c
Merge branch 'linus' into tracing/hw-branch-tracing
Documentation/kernel-parameters.txt
arch/x86/Kconfig.cpu