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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 77d0563 d508afb)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 7 Apr 2009 09:15:40 +0000 (11:15 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 7 Apr 2009 09:15:40 +0000 (11:15 +0200)
commit	5e34437840d33554f69380584311743b39e8fbeb
tree	e081135619ee146af5efb9ee883afca950df5757	tree \| snapshot
parent	77d05632baee21b1cef8730d7c06aa69601e4dca	commit \| diff
parent	d508afb437daee7cf07da085b635c44a4ebf9b38	commit \| diff

Merge branch 'linus' into core/softlockup

Conflicts:
kernel/sysctl.c

include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history

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