projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a9746e4
966031f
)
Merge tag 'tty-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 31 Dec 2017 18:46:07 +0000
(10:46 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 31 Dec 2017 18:46:07 +0000
(10:46 -0800)
Pull TTY fix from Greg KH:
"Here is a single tty fix for a reported issue that you wrote the patch
for :)
It's been in linux-next for a week or so with no reported issues"
* tag 'tty-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
n_tty: fix EXTPROC vs ICANON interaction with TIOCINQ (aka FIONREAD)
Trivial merge