tree 150e920f530a4a12b56102e96fdf81ddf466cb68
parent aa033810461ee56abbef6cef10aabd6b97f5caee
parent 6b8224e40af147d3300136ce6d037db48f89068f
author Linus Torvalds <torvalds@linux-foundation.org> 1369154206 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1369154206 -0700

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

Pull s390 update from Martin Schwidefsky:
 "An additional sysfs attribute for channel paths and a couple of bux
  fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pgtable: fix ipte notify bit
  s390/xpram: mark xpram as non-rotational
  s390/smp: fix cpu re-scan vs. cpu state
  s390/cio: add channel ID sysfs attribute
  s390/ftrace: fix mcount adjustment
  s390: fix gmap_ipte_notifier vs. software dirty pages
  s390: disable pfmf for clear page instruction
  s390/disassembler: prevent endless loop in print_fn_code()
  s390: remove non existent reference to GENERIC_KERNEL_THREAD