git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 668a6c3 0665190)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 16 Jun 2008 09:16:46 +0000 (11:16 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 16 Jun 2008 09:16:46 +0000 (11:16 +0200)
commit	cb9aa97c21c59ad01c9514d7faf45dc166fba226
tree	66a530f154db78b85f5b1406ebc51401df8d3913	tree
parent	668a6c3654560aef8741642478973e205a4f02bf	commit \| diff
parent	066519068ad2fbe98c7f45552b1f592903a9c8c8	commit \| diff

Merge branch 'linus' into tracing/mmiotrace-mergefixups

12 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_32.S	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/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/ioremap.c	diff1 \|	diff2 \|	blob \| history
arch/x86/vdso/vclock_gettime.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history

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