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: c7e78cf 0173a32)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 28 Oct 2008 15:54:49 +0000 (16:54 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 28 Oct 2008 15:54:49 +0000 (16:54 +0100)
commit	d1a76187a5be4f89c6cb19d800cb5fb7aac735c5
tree	2fac3ffbfffc7560eeef8364b541d0d7a0057920	tree \| snapshot
parent	c7e78cff6b7518212247fb20b1dc6411540dc9af	commit \| diff
parent	0173a3265b228da319ceb9c1ec6a5682fd1b2d92	commit \| diff

Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
arch/um/include/asm/system.h

arch/um/include/asm/system.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/uaccess.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/uaccess_32.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/uaccess_64.h	diff1 \|	diff2 \|	blob \| history
arch/x86/lib/usercopy_32.c	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
mm/memory.c	diff1 \|	diff2 \|	blob \| history

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