diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-22 08:56:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-22 08:56:55 +0200 |
| commit | b4a338d2b3cafa1be68d4e1903203c7e08a38ee5 (patch) | |
| tree | 069f3753af1cda34c36a7627000ab46ef5c51c83 /drivers/eisa | |
| parent | 34cfb106d1f8a746fcccbe61c852f705dcdceaa2 (diff) | |
| parent | 08332893e37af6ae779367e78e444f8f9571511d (diff) | |
Merge 4.12-rc2 into char-misc-next
We want the fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/eisa')
0 files changed, 0 insertions, 0 deletions