summaryrefslogtreecommitdiff
path: root/include/linux/vt_kern.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-23 09:39:23 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-23 09:39:23 -0700
commit10af77c193681398e5dbe830db181d86047fcd41 (patch)
treeb843eb8dae09a53efb410dd11d2132dba4fe4d15 /include/linux/vt_kern.h
parent66f75a5d028beaf67c931435fdc3e7823125730c (diff)
parent5f1a38952b7e932a1c169c28917b9a831f641bcc (diff)
Merge 3.4-rc4 into tty-next
This resolves the merge problem with: drivers/tty/serial/pch_uart.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/vt_kern.h')
0 files changed, 0 insertions, 0 deletions