diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-23 12:39:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-23 12:39:23 -0400 |
| commit | 10af77c193681398e5dbe830db181d86047fcd41 (patch) | |
| tree | b843eb8dae09a53efb410dd11d2132dba4fe4d15 /drivers/char/tlclk.c | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
| parent | 5f1a38952b7e932a1c169c28917b9a831f641bcc (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 'drivers/char/tlclk.c')
0 files changed, 0 insertions, 0 deletions