| commit | becba85f0e1ca8ab97bd7e836a7129a94ace1ff2 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 09 07:08:37 2015 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 09 07:08:37 2015 +0100 |
| tree | 3a43cb5edc60310c89790ab0961f5276bd9ca615 | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 [diff] | |
| parent | 3372ec28622083ac87daf18918a222fbee06f6f9 [diff] |
Merge 4.0-rc3 into tty-testing This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>