tree b2e45cfe4d22ba7bd8c3b2fe0199bfa282e06224
parent d030671f3f261e528dc6e396a13f10859a74ae7c
parent 5da76157a4b7d5f595c846cf5e95f6d085b350e2
author Linus Torvalds <torvalds@linux-foundation.org> 1410190020 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1410190020 -0700

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

Pull s390 fixes from Martin Schwidefsky:
 "A bug fix for the vdso code, the loadparm for booting from SCSI is
  added and the access permissions for the dasd module parameters are
  corrected"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/vdso: remove NULL pointer check from clock_gettime
  s390/ipl: Add missing SCSI loadparm attributes to /sys/firmware
  s390/dasd: Make module parameter visible in sysfs