projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d030671 5da7615)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2014 15:27:00 +0000 (08:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2014 15:27:00 +0000 (08:27 -0700)
commit35af25616c6c0c42416545f732d36b2ba7199519
treeb2e45cfe4d22ba7bd8c3b2fe0199bfa282e06224tree | snapshot
parentd030671f3f261e528dc6e396a13f10859a74ae7ccommit | diff
parent5da76157a4b7d5f595c846cf5e95f6d085b350e2commit | diff
Merge branch 'for-linus' of git://git./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
Domain: System / Kernel;