tree a650baf4e935976b10911306ffbe6b53d66f88c7
parent d7e53922aa47b7a5a91bc34da00348e6ee0ed242
parent 892365ab4d29ed861709ee8611b53587ca2bb75f
author Linus Torvalds <torvalds@linux-foundation.org> 1330654975 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1330654975 -0800

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

Pull s390 fixes from Martin Schwidefsky

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] memory hotplug: prevent memory zone interleave
  [S390] crash_dump: remove duplicate include
  [S390] KEYS: Enable the compat keyctl wrapper on s390x