Merge branch 'linus' into x86/tracehook
authorIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 15:07:34 +0000 (17:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 15:07:34 +0000 (17:07 +0200)
commit04197c83b3e05546d1003cfa3ff43f1639c0057f
treec04ddce9f519b91c0b20c6c09f7529928350eefe
parent71998e83c520c7a91b254dc9705baeedbee0d44f
parentb635acec48bcaa9183fcbf4e3955616b0d4119b5
Merge branch 'linus' into x86/tracehook

Conflicts:
arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig