tree 4928379eef6664788be968616e90f6a44de2d4a9
parent f9677375b0c07e39c78b43aab9fb2c253a4b50c2
parent 61b0b01686d482205db14987826e1a11dd17d65c
author Linus Torvalds <torvalds@linux-foundation.org> 1424546306 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1424546306 -0800

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

Pull s390 fixes from Martin Schwidefsky:
 "Two patches to save some memory if CONFIG_NR_CPUS is large, a changed
  default for the use of compare-and-delay, and a couple of bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/spinlock: disabled compare-and-delay by default
  s390/mm: align 64-bit PIE binaries to 4GB
  s390/cacheinfo: coding style changes
  s390/cacheinfo: fix shared cpu masks
  s390/smp: reduce size of struct pcpu
  s390/topology: convert cpu_topology array to per cpu variable
  s390/topology: delay initialization of topology cpu masks
  s390/vdso: fix clock_gettime for CLOCK_THREAD_CPUTIME_ID, -2 and -3