diff options
| author | Greg Kroah-Hartman | 2014-02-13 10:06:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-13 10:06:34 -0800 |
| commit | 5669b705024659e982472cef22f7fc3c3a09cba2 (patch) | |
| tree | d04f516fdf65a781434d13cc4e61b78d7416e40e /drivers/pnp | |
| parent | 05202872ca98f8ea61943a9b530417c5503b816f (diff) | |
| parent | 45a7bd635930baa960b6817674c64bdfb8f39570 (diff) | |
Merge branch 'tty-linus' into tty-next
We want the tty core fixes in here as well, because other patches depend
on them.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pnp')
0 files changed, 0 insertions, 0 deletions