diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-02 09:08:45 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-02 09:08:45 -0800 |
commit | 74e5c265a4955d6a01adc40783346b716271170b (patch) | |
tree | fc47a6b896e07a06d4bc14cfb5a475fc59d022c3 /arch/mips/cavium-octeon/csrc-octeon.c | |
parent | 71a332e5603e000b907e66d172eae0e7a8c2c653 (diff) | |
parent | cabab3f9f5ca077535080b3252e6168935b914af (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Two bug fixes for 4.10-rc3"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/kbuild: enable modversions for symbols exported from asm
s390/vtime: correct system time accounting
Diffstat (limited to 'arch/mips/cavium-octeon/csrc-octeon.c')
0 files changed, 0 insertions, 0 deletions