diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-23 18:39:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-23 18:39:23 +0200 |
| commit | 10af77c193681398e5dbe830db181d86047fcd41 (patch) | |
| tree | b843eb8dae09a53efb410dd11d2132dba4fe4d15 /drivers/xen/grant-table.c | |
| parent | Linux 3.4-rc4 (diff) | |
| parent | serial/8250_pci: fix suspend/resume vs init/exit quirks (diff) | |
| download | linux-10af77c193681398e5dbe830db181d86047fcd41.tar.xz linux-10af77c193681398e5dbe830db181d86047fcd41.zip | |
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/xen/grant-table.c')
0 files changed, 0 insertions, 0 deletions