]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 19:09:50 +0000 (20:09 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 19:09:50 +0000 (20:09 +0100)
commita64d31baed104be25305e9c71585d3ea4ee9a418
tree470e3c59ef39f38bcd69f8fef7dba8f76afbec53
parent1c39194878c09bd88ffc9c9d4c2f01c3397c7aed
parent061e41fdb5047b1fb161e89664057835935ca1d2
Merge branch 'linus' into cpus4096

Conflicts:
kernel/trace/ring_buffer.c
arch/x86/kernel/Makefile
include/linux/sched.h
kernel/profile.c
kernel/sched.c
kernel/sysctl.c