Ingo Molnar 96200591a3 Merge branch 'tracing/hw-breakpoints' into perf/core ... Conflicts: arch/x86/kernel/kprobes.c kernel/trace/Makefile Merge reason: hw-breakpoints perf integration is looking good in testing and in reviews, plus conflicts are mounting up - so merge & resolve. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-11-21 14:07:23 +01:00
..
kmemcheck	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck	2009-09-22 08:07:54 -07:00
dump_pagetables.c
extable.c
fault.c	Merge commit 'v2.6.32-rc5' into perf/probes	2009-10-17 09:58:25 +02:00
gup.c
highmem_32.c	Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2009-09-14 17:43:43 -07:00
hugetlbpage.c
init_32.c	kcore: use registerd physmem information	2009-09-23 07:39:41 -07:00
init_64.c	kcore: register module area in generic way	2009-09-23 07:39:42 -07:00
init.c	x86: split NX setup into separate file to limit unstack-protected code	2009-09-21 13:56:58 -07:00
iomap_32.c	x86, pat: Add PAT reserve free to io_mapping* APIs	2009-08-26 15:41:16 -07:00
ioremap.c	x86: Fix error return sequence in __ioremap_caller()	2009-11-08 12:48:58 +01:00
k8topology_64.c
kmmio.c
Makefile	x86: split NX setup into separate file to limit unstack-protected code	2009-09-21 13:56:58 -07:00
memtest.c
mmap.c	x86: Increase MIN_GAP to include randomized stack	2009-09-10 17:00:12 -07:00
mmio-mod.c
numa_32.c
numa_64.c
numa.c
pageattr-test.c
pageattr.c	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-09-24 10:30:41 -07:00
pat.c	x86: Reduce verbosity of "PAT enabled" kernel message	2009-09-24 11:35:19 +02:00
pf_in.c
pf_in.h
pgtable_32.c
pgtable.c
physaddr.c	x86: split __phys_addr out into separate file	2009-09-10 11:48:55 -07:00
physaddr.h	x86: split __phys_addr out into separate file	2009-09-10 11:48:55 -07:00
setup_nx.c	x86: split NX setup into separate file to limit unstack-protected code	2009-09-21 13:56:58 -07:00
srat_32.c	x86: Decrease the level of some NUMA messages to KERN_DEBUG	2009-09-06 06:32:23 +02:00
srat_64.c
testmmiotrace.c	testmmiotrace.c: Add and use pr_fmt(fmt)	2009-10-12 08:05:41 +02:00
tlb.c	cpumask: use mm_cpumask() wrapper: x86	2009-09-24 09:34:52 +09:30