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

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a1ef58f fec6c6f)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Mar 2009 10:42:31 +0000 (11:42 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Mar 2009 10:42:31 +0000 (11:42 +0100)
commit	8163d88c79dca35478a2405c837733ac50ea4c39
tree	6acae066a09b7dcbedab4a35ad62eba4ba3fd83c	tree \| snapshot
parent	a1ef58f442542d8b3e3b963339fbc522c36e827c	commit \| diff
parent	fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc	commit \| diff

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

Conflicts:
arch/x86/mm/iomap_32.c

17 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/iosapic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pat.c	diff1 \|	diff2 \|	blob \| history
arch/x86/oprofile/op_model_ppro.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pci/dmar.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/intr_remapping.c	diff1 \|	diff2 \|	blob \| history
include/linux/io-mapping.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
mm/vmalloc.c	diff1 \|	diff2 \|	blob \| history

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