summaryrefslogtreecommitdiff
path: root/drivers/char/toshiba.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-30 01:44:13 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-30 01:44:13 (GMT)
commit4ceedcf8151c1b91ad45a2603d4473c0ad3ac03c (patch)
tree3282387ff7ac6fd108a119417bd1f93c018fed1a /drivers/char/toshiba.c
parent058555739166561b97313123521574f0a9b2c9d7 (diff)
parent15c03dd4859ab16f9212238f29dd315654aa94f6 (diff)
downloadlinux-4ceedcf8151c1b91ad45a2603d4473c0ad3ac03c.tar.xz
Merge 3.12-rc3 into tty-next
We want the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/toshiba.c')
0 files changed, 0 insertions, 0 deletions