Merge branch 'linus' into x86/pebs
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:32:01 +0000 (12:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:32:01 +0000 (12:32 +0200)
commitda7878d75b8520c9ae00d27dfbbce546a7bfdfbb
tree547fd497a80818a60ac36831377d5df97868173c
parent0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into x86/pebs
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c