diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-27 09:37:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-27 09:37:12 -0700 |
commit | 79a17dd9d2491443a0d03745adbb3d76ab97a356 (patch) | |
tree | d1e8882799f1ba20470f169ac0b6d96f7dfc98ba /kernel/uid16.c | |
parent | 1993cbf06aa95c0fcf080f2e858c116306b6c29e (diff) | |
parent | b00e2fd10429eddf4a181ad30af010e56c2303f9 (diff) | |
download | linux-79a17dd9d2491443a0d03745adbb3d76ab97a356.tar.bz2 |
Merge tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH:
"Here are two staging driver fixups for 4.17-rc3.
The first is the remaining stragglers of the irda code removal that
you pointed out during the merge window. The second is a fix for the
wilc1000 driver due to a patch that got merged in 4.17-rc1.
Both of these have been in linux-next for a while with no reported
issues"
* tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: wilc1000: fix NULL pointer exception in host_int_parse_assoc_resp_info()
staging: irda: remove remaining remants of irda code removal
Diffstat (limited to 'kernel/uid16.c')
0 files changed, 0 insertions, 0 deletions