android_kernel_xiaomi_sm8350/arch
Robert Richter 6268464b37 Merge remote branch 'tip/perf/core' into oprofile/core
Conflicts:
	arch/arm/oprofile/common.c
	kernel/perf_event.c
2010-10-15 12:45:00 +02:00
..
alpha Merge commit 'v2.6.36-rc7' into perf/core 2010-10-08 10:46:27 +02:00
arm Merge remote branch 'tip/perf/core' into oprofile/core 2010-10-15 12:45:00 +02:00
avr32 modules: Fix module_bug_list list corruption race 2010-10-05 11:29:27 -07:00
blackfin
cris
frv
h8300 modules: Fix module_bug_list list corruption race 2010-10-05 11:29:27 -07:00
ia64
m32r m32r: fix breakage from "m32r: use generic ptrace_resume code" 2010-09-24 13:54:19 -07:00
m68k arch/m68k/mac/macboing.c: use unsigned long for irqflags 2010-10-01 10:50:58 -07:00
m68knommu
microblaze
mips MIPS: Octeon: Place cnmips_cu2_setup in __init memory. 2010-10-04 18:34:00 +01:00
mn10300 modules: Fix module_bug_list list corruption race 2010-10-05 11:29:27 -07:00
parisc modules: Fix module_bug_list list corruption race 2010-10-05 11:29:27 -07:00
powerpc Merge commit 'v2.6.36-rc7' into perf/core 2010-10-08 10:46:27 +02:00
s390 modules: Fix module_bug_list list corruption race 2010-10-05 11:29:27 -07:00
score
sh Merge remote branch 'tip/perf/core' into oprofile/core 2010-10-15 12:45:00 +02:00
sparc Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core 2010-09-24 09:12:05 +02:00
tile Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 2010-09-24 19:08:39 -07:00
um Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2010-10-04 11:11:01 -07:00
x86 Merge remote branch 'tip/perf/core' into oprofile/core 2010-10-15 12:45:00 +02:00
xtensa
.gitignore
Kconfig Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core 2010-09-24 09:12:05 +02:00