pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f69feff 3c93390)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 10 Sep 2008 06:20:51 +0000 (08:20 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 10 Sep 2008 06:20:51 +0000 (08:20 +0200)
commit	81faaae45701484bd7368336e02f2a846153b22f
tree	d7d8dcafe5bb22decb0024537478fb667b0c896b	tree \| snapshot
parent	f69feff720497237ae9dd2f4604921bd3080c421	commit \| diff
parent	3c9339049df5cc3a468c11de6c4101a1ea8c3d83	commit \| diff

Merge branch 'x86/pebs' into x86/unify-cpu-detect

Conflicts:
arch/x86/Kconfig.cpu
include/asm-x86/ds.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/Kconfig.cpu	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/ds.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/ptrace-abi.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/ptrace.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.