]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
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)
1  2 
arch/x86/kernel/ptrace.c
arch/x86/kernel/setup_64.c

Simple merge
Simple merge