tree 3bfc8c7fac0a8fd607e6a95224207c36f3421854
parent 1c6ba37b3de535f29ec4353a1f5290f256629775
parent 52319b457cd78aa891f5947cf2237dd5f6a4c52d
author Linus Torvalds <torvalds@linux-foundation.org> 1363619953 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1363619953 -0700

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

Pull s390 fixes from Martin Schwidefsky:
 "A couple of bug fixes, the most hairy on is the flush_tlb_kernel_range
  fix.  Another case of "how could this ever have worked?"."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/kdump: Do not add standby memory for kdump
  drivers/i2c: remove !S390 dependency, add missing GENERIC_HARDIRQS dependencies
  s390/scm: process availability
  s390/scm_blk: suspend writes
  s390/scm_drv: extend notify callback
  s390/scm_blk: fix request number accounting
  s390/mm: fix flush_tlb_kernel_range()
  s390/mm: fix vmemmap size calculation
  s390: critical section cleanup vs. machine checks