Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Mar 2012 01:36:38 +0000 (18:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Mar 2012 01:36:38 +0000 (18:36 -0700)
commit6658a6991cef75719a21441aa0b7f8d6821534ee
tree656bd5785f225929c73b43b31d6eda35fab93026
parentfa453a625de5b8ee9ada0a5b329df3f88751c615
parent5d3b56f93244dd5f64f60601bf63caf70d693f75
Merge branch 'for-linus' of git://git./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