Ingo Molnar 61be7fdec2 Merge branch 'perf/nmi' into perf/core ... Conflicts: kernel/Makefile Merge reason: Add the now complete topic, fix the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-08-05 08:45:05 +02:00
..
alpha	Merge branch 'linus' into perf/core	2010-06-28 22:33:24 +02:00
arm	Merge commit 'v2.6.35' into perf/core	2010-08-02 08:31:54 +02:00
avr32	Merge commit 'v2.6.35' into perf/core	2010-08-02 08:31:54 +02:00
blackfin	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
cris	Merge commit 'v2.6.35-rc3' into perf/core	2010-06-18 10:53:19 +02:00
frv	Merge commit 'v2.6.35-rc3' into perf/core	2010-06-18 10:53:19 +02:00
h8300	Merge commit 'v2.6.35-rc3' into perf/core	2010-06-18 10:53:19 +02:00
ia64	Merge commit 'v2.6.35-rc4' into perf/core	2010-07-05 08:30:58 +02:00
m32r	Merge commit 'v2.6.35-rc3' into perf/core	2010-06-18 10:53:19 +02:00
m68k	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
m68knommu	Merge branch 'for-35' of git://repo.or.cz/linux-kbuild	2010-06-01 08:55:52 -07:00
microblaze	Merge branch 'linus' into perf/core	2010-07-21 21:43:06 +02:00
mips	Merge commit 'v2.6.35' into perf/core	2010-08-02 08:31:54 +02:00
mn10300	Merge commit 'v2.6.35-rc3' into perf/core	2010-06-18 10:53:19 +02:00
parisc	Merge commit 'v2.6.35-rc3' into perf/core	2010-06-18 10:53:19 +02:00
powerpc	perf, powerpc: fsl_emb: Restore setting perf_sample_data.period	2010-08-03 10:56:45 +10:00
s390	Merge commit 'v2.6.35' into perf/core	2010-08-02 08:31:54 +02:00
score	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
sh	Merge branch 'linus' into perf/core	2010-07-21 21:43:06 +02:00
sparc	Merge branch 'linus' into perf/core	2010-07-21 21:43:06 +02:00
um	um: os-linux/mem.c needs sys/stat.h	2010-06-29 15:29:32 -07:00
x86	Merge branch 'perf/nmi' into perf/core	2010-08-05 08:45:05 +02:00
xtensa	Merge commit 'v2.6.35-rc3' into perf/core	2010-06-18 10:53:19 +02:00
.gitignore
Kconfig	Merge branch 'perf/nmi' into perf/core	2010-08-05 08:45:05 +02:00