| commit | 10af77c193681398e5dbe830db181d86047fcd41 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Apr 23 09:39:23 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Apr 23 09:39:23 2012 -0700 |
| tree | b843eb8dae09a53efb410dd11d2132dba4fe4d15 | |
| 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>