Merge branch 'linus' into x86/pebs
authorThomas Gleixner <tglx@linutronix.de>
Sat, 17 May 2008 14:01:05 +0000 (16:01 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 17 May 2008 14:01:05 +0000 (16:01 +0200)
commit0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13
tree3c688483e71261f564fc43be3157b337ae340dca
parent34b2cd5b688b012975fcfc3b3970fc3508fa82c4
parentf26a3988917913b3d11b2bd741601a2c64ab9204
Merge branch 'linus' into x86/pebs
arch/x86/kernel/ptrace.c
arch/x86/kernel/setup_64.c