diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-16 07:46:38 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-16 07:46:38 -0800 |
commit | d6ee1a2894c445a0bed1d2dc04e8f13f1f6c0311 (patch) | |
tree | 78bd745e014adc8cfbce8421d6bf966d5815388d /drivers/scsi/nsp32_io.h | |
parent | 7e111565b70e57ae45d154d79581ecc591d19d9a (diff) | |
parent | 1838b8c487378c6c576029d9e0e07b5a73036bac (diff) | |
download | linux-d6ee1a2894c445a0bed1d2dc04e8f13f1f6c0311.tar.bz2 |
Merge tag 'tty-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY fixes from Greg Kroah-Hartman:
"Here are two TTY driver fixes for 3.7-rc5.
They resolve a bug in the hvc driver that has been reported, and fix a
problem with the list of device ids in the max310x serial driver.
Both have been in linux-next for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'tty-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
tty: serial: max310x: Add terminating entry for spi_device_id table
TTY: hvc_console, fix port reference count going to zero prematurely
Diffstat (limited to 'drivers/scsi/nsp32_io.h')
0 files changed, 0 insertions, 0 deletions