git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: af37501 1de9e8e)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 21 Jan 2009 15:37:27 +0000 (16:37 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 21 Jan 2009 15:37:27 +0000 (16:37 +0100)
commit	77835492ed489c0b870f82f4c50687bd267acc0a
tree	d80903ce1b8dd30aa44ccfc756616ad4d6c74d63	tree \| snapshot
parent	af37501c792107c2bde1524bdae38d9a247b841a	commit \| diff
parent	1de9e8e70f5acc441550ca75433563d91b269bbe	commit \| diff

Merge commit 'v2.6.29-rc2' into perfcounters/core

Conflicts:
include/linux/syscalls.h

16 files changed:

arch/powerpc/include/asm/systbl.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/mpic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/syscall_table_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pat.c	diff1 \|	diff2 \|	blob \| history
drivers/char/sysrq.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
include/linux/syscalls.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
kernel/sys_ni.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git