summaryrefslogtreecommitdiff
path: root/net/packet
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-09 12:32:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-09 12:32:44 -0700
commit183c948a3cb3efbf45eabed41fa7ee04c19378fc (patch)
tree00f4cc777b7ba96d72666208a3c454fa26a33758 /net/packet
parentffb927d1dce051f2c93d4510e446589189c1bf27 (diff)
parent5e00bbfbc5ec21e87d24e206bba9fc2cbe6631a1 (diff)
Merge tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty fixes from Greg KH: "Here are two tty fixes for issues found. One was due to a merge error in 4.6-rc1, and the other a regression fix for UML consoles that broke in 4.6-rc1. Both have been in linux-next for a while" * tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: tty: Fix merge of "tty: Refactor tty_open()" tty: Fix UML console breakage
Diffstat (limited to 'net/packet')
0 files changed, 0 insertions, 0 deletions