Ingo Molnar f407a82586 Merge branch 'linus' into sched/core, to resolve conflict ... Conflicts: arch/sparc/include/asm/topology_64.h Signed-off-by: Ingo Molnar <mingo@kernel.org>		2015-06-02 08:05:42 +02:00
..
boot	powerpc: Remove the celleb support	2015-04-07 17:15:13 +10:00
configs	powerpc: Remove the celleb support	2015-04-07 17:15:13 +10:00
crypto	crypto: powerpc - move files to fix build error	2015-03-09 21:06:19 +11:00
include	sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask()	2015-05-27 15:22:15 +02:00
kernel	powerpc: Align TOC to 256 bytes	2015-05-14 16:59:21 +10:00
kvm	KVM: PPC: Book3S HV: Fix list traversal in error case	2015-05-10 17:26:05 +02:00
lib	sched/preempt, powerpc: Disable preemption in enable_kernel_altivec() explicitly	2015-05-19 08:39:17 +02:00
math-emu	powerpc: Correct emulated mtfsf instruction	2014-04-07 10:33:11 +10:00
mm	Merge branch 'linus' into sched/core, to resolve conflict	2015-06-02 08:05:42 +02:00
net	ppc: bpf: Add SKF_AD_CPU for ppc32	2015-02-20 15:19:43 -05:00
oprofile	powerpc/oprofile: reduce mmap_sem hold for exe_file	2015-04-17 09:04:11 -04:00
perf	powerpc/mm/thp: Make page table walk safe against thp split/collapse	2015-04-17 11:23:39 +10:00
platforms	powerpc/pseries: Correct cpu affinity for dlpar added cpus	2015-05-01 13:47:24 +10:00
sysdev	powerpc: dart_iommu: Remove check for controller_ops == NULL case	2015-04-11 20:49:19 +10:00
xmon	powerpc updates for 3.20	2015-02-11 18:15:38 -08:00
Kconfig	powerpc updates for 4.1	2015-04-16 13:53:32 -05:00
Kconfig.debug	powerpc: Remove the celleb support	2015-04-07 17:15:13 +10:00
Makefile	powerpc: Convert relocs_check to a shell script using grep	2015-03-23 14:47:39 +11:00
relocs_check.sh	powerpc: Convert relocs_check to a shell script using grep	2015-03-23 14:47:39 +11:00