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: 1c39194 061e41f)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 2 Dec 2008 19:09:50 +0000 (20:09 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 2 Dec 2008 19:09:50 +0000 (20:09 +0100)
commit	a64d31baed104be25305e9c71585d3ea4ee9a418
tree	470e3c59ef39f38bcd69f8fef7dba8f76afbec53	tree \| snapshot
parent	1c39194878c09bd88ffc9c9d4c2f01c3397c7aed	commit \| diff
parent	061e41fdb5047b1fb161e89664057835935ca1d2	commit \| diff

Merge branch 'linus' into cpus4096

Conflicts:
kernel/trace/ring_buffer.c

arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/profile.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history

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