tree 656bd5785f225929c73b43b31d6eda35fab93026
parent fa453a625de5b8ee9ada0a5b329df3f88751c615
parent 5d3b56f93244dd5f64f60601bf63caf70d693f75
author Linus Torvalds <torvalds@linux-foundation.org> 1332898598 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1332898598 -0700

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

Pull s390 patches part 2 from Martin Schwidefsky:
 "Some minor improvements and one additional feature for the 3.4 merge
  window: Hendrik added perf support for the s390 CPU counters."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] register cpu devices for SMP=n
  [S390] perf: add support for s390x CPU counters
  [S390] oprofile: Allow multiple users of the measurement alert interrupt
  [S390] qdio: log all adapter characteristics
  [S390] Remove unncessary export of arch_pick_mmap_layout