]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'x86/pebs' into x86-v28-for-linus-phase1
authorIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 14:17:23 +0000 (16:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 14:17:23 +0000 (16:17 +0200)
commit19268ed7449c561694d048a34601a30e2d1aaf79
tree6f3f28ddac5d2b1cecd0f18ccf283f076839532a
parentb8cd9d056bbc5f2630ab1787dbf76f83bbb517c0
parent493cd9122af5bd0b219974a48f0e31da0c29ff7e
Merge branch 'x86/pebs' into x86-v28-for-linus-phase1

Conflicts:
include/asm-x86/ds.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
include/asm-x86/ds.h
include/asm-x86/processor.h
include/asm-x86/ptrace-abi.h
include/asm-x86/ptrace.h