diff options
| author | Linus Torvalds <[email protected]> | 2017-01-02 17:08:45 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-01-02 17:08:45 +0000 |
| commit | 74e5c265a4955d6a01adc40783346b716271170b (patch) | |
| tree | fc47a6b896e07a06d4bc14cfb5a475fc59d022c3 /net/unix/af_unix.c | |
| parent | Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux (diff) | |
| parent | s390/kbuild: enable modversions for symbols exported from asm (diff) | |
| download | kernel-74e5c265a4955d6a01adc40783346b716271170b.tar.gz kernel-74e5c265a4955d6a01adc40783346b716271170b.zip | |
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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions