diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 16:45:24 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 16:45:24 -0400 |
| commit | caa445d808d27880f92d866902f6717f4d4cd3ca (patch) | |
| tree | c46a564ecbce58310436f0f30b8f3c6d5d93c19b | |
| parent | 48d7ff0eaacbe5a51037bdb06a8a0a729b804b5f (diff) | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
Merge 4.0-rc5 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>