Ingo Molnar 73e21ce28d Merge branch 'perf/urgent' into perf/core ... Conflicts: arch/x86/kernel/cpu/perf_event_intel.c Merge in the latest fixes before applying new patches, resolve the conflict. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2013-04-21 10:57:33 +02:00
..
boot	Merge remote-tracking branch 'agust/next' into next	2013-02-20 11:39:05 +11:00
configs	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-02-23 17:09:55 -08:00
crypto	powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit	2013-03-05 16:56:26 +11:00
include	Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core	2013-04-16 11:04:10 +02:00
kernel	Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core	2013-04-16 11:04:10 +02:00
kvm	powerpc: Rename USER_ESID_BITS* to ESID_BITS*	2013-03-17 12:45:44 +11:00
lib	uprobes/powerpc: Add dependency on single step emulation	2013-01-29 11:35:06 +11:00
math-emu
mm	powerpc: Rename USER_ESID_BITS* to ESID_BITS*	2013-03-17 12:45:44 +11:00
net	PPC: net: bpf_jit_comp: add VLAN instructions for BPF JIT	2012-11-17 22:12:47 -05:00
oprofile	Merge branch 'merge' into next	2013-01-29 11:33:37 +11:00
perf	perf/urgent fixes:	2013-03-18 10:00:56 +01:00
platforms	powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test	2013-04-08 15:19:09 +10:00
sysdev	Merge remote-tracking branch 'agust/next' into next	2013-02-20 11:39:05 +11:00
xmon	powerpc: Rename set_break to avoid naming conflict	2013-01-16 05:25:47 +11:00
Kconfig	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-03-18 08:12:41 -07:00
Kconfig.debug	powerpc: IOMMU fault injection	2012-07-10 19:18:59 +10:00
Makefile	powerpc: Avoid load of static chain register when calling nested functions through a pointer on 64bit	2013-01-10 17:01:27 +11:00
relocs_check.pl	powerpc: Process dynamic relocations for kernel	2011-12-20 10:21:08 -05:00