Linus Torvalds 6c09931b3f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux ... Pull s390 updates from Martin Schwidefsky: "The main new feature is machine support for System zEC12 including transactional memory, runtime instrumentation, support for scm block devices via eadm subchannels, and support for CEX4 crypto cards. In addition there are some nice improvements: bpf jit compiler, arch backend for cmpxchg_double, relative exception table entries, dasd partition detection independent from the dasd driver ioctls, and cpu cache information in /proc/cpuinfo and /sys/device/cpu. And last but not least a series of cleanup patches from Heiko." Fix up trivial add-add conflict in arch/s390/Kconfig due to commit b952741c80 ("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING") * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (76 commits) s390: update defconfig s390/jump label,nss: let shared kernel support depend on !JUMP_LABEL s390/disassembler: fix decoding of risblg instruction s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction s390/traps: move call to print_modules() out of show_regs() s390/mm: mark free_initrd_mem() as __init s390/dasd: check count address during online setting drivers/s390/char/monreader.c: fix error return code s390/cmpxchg,percpu: implement cmpxchg_double() s390/percpu: implement this_cpu_add_return() s390/percpu: implement this_cpu_xchg() s390/kexec: remove CONFIG_KEXEC s390/irq: use designated initializers for irq class array s390: add uninitialized_var() to suppress false positive compiler warnings s390/crashdump: move fill_cpu_elf_notes() prototype to header file s390/process: add missing header include s390/ptrace: add missing ifdef s390/ipl,decrompressor: disable branch profiling s390/perf_events: compile only for CONFIG_64BIT s390/tape: remove even more tape block leftovers ...		2012-10-01 11:49:56 -07:00
..
appldata	s390/vtimer: rework virtual timer interface	2012-07-20 11:15:08 +02:00
boot	s390/ipl,decrompressor: disable branch profiling	2012-09-26 15:45:21 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-07-26 13:00:59 -07:00
hypfs	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
include/asm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2012-10-01 11:49:56 -07:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2012-10-01 11:49:56 -07:00
kvm	s390/sysinfo,stsi: change return code handling	2012-09-26 15:45:12 +02:00
lib	s390/string: provide asm lib functions for memcpy and memcmp	2012-09-26 15:44:50 +02:00
math-emu	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
mm	s390/mm: mark free_initrd_mem() as __init	2012-09-26 15:45:27 +02:00
net	s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction	2012-09-26 15:45:28 +02:00
oprofile	oprofile, s390: Fix uninitialized memory access when writing to oprofilefs	2012-08-27 14:49:23 +02:00
defconfig	s390: update defconfig	2012-09-26 15:45:29 +02:00
Kbuild	s390/bpf,jit: BPF Just In Time compiler for s390	2012-09-26 15:44:49 +02:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2012-10-01 11:49:56 -07:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	s390: Use generic init_task	2012-05-05 13:00:25 +02:00