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

..

appldata

s390: appldata: drop owner assignment from platform_drivers

2014-10-20 16:20:13 +02:00

boot

s390: remove "64" suffix from a couple of files

2015-03-25 11:49:34 +01:00

configs

s390: update default configuration

2015-01-22 12:16:09 +01:00

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2015-05-22 14:26:36 -07:00

hypfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-04-26 17:22:07 -07:00

include

Merge branch 'linus' into sched/core, to resolve conflict

2015-06-02 08:05:42 +02:00

kernel

Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc

2015-04-15 13:53:55 -07:00

kvm

This mostly includes the PPC changes for 4.1, which this time cover

2015-04-26 13:06:22 -07:00

lib

s390: remove "64" suffix from mem64.S and swsusp_asm64.S

2015-03-25 11:49:51 +01:00

mm

mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler

2015-05-19 08:39:15 +02:00

net

s390/bpf: Fix gcov stack space problem

2015-04-30 13:50:36 +02:00

oprofile

s390: remove 31 bit support

2015-03-25 11:49:33 +01:00

pci

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2015-04-20 10:15:33 -07:00

defconfig

s390: update default configuration

2015-01-22 12:16:09 +01:00

Kbuild

s390: remove 31 bit support

2015-03-25 11:49:33 +01:00

Kconfig

s390/bpf: add dependency to z196 features

2015-04-23 16:55:50 +02:00

Kconfig.debug

…

Makefile

s390: remove 31 bit support

2015-03-25 11:49:33 +01:00