| commit | dd63af108f0814f0b589659f4e55a7a5af3b7e53 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sat Dec 06 08:17:24 2014 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sat Dec 06 08:17:24 2014 -0800 |
| tree | 0a7679fecb5b516cddb2153c632a4262899be6c3 | |
| parent | 50d1e7d1077b276e8faa9eebf8b710edf31fdeea [diff] | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a [diff] |
Merge 3.18-rc7 into tty-next This resolves the merge issue with drivers/tty/serial/of_serial.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>