diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-08 11:04:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-08 11:04:26 +1000 |
| commit | e876b41ab074561d65f213bf5e0fc68cf5bc7380 (patch) | |
| tree | 5bcbd7e4f7b6ac2a34e61011f8eb2cde90bf8603 /arch/s390/Kconfig | |
| parent | 47c0fd72822159eb501411f975f5672a0bf7a7fb (diff) | |
| parent | 527e9316f8ec44bd53d90fb9f611fa7ffff52bb9 (diff) | |
Back merge tag 'v4.4-rc4' into drm-next
We've picked up a few conflicts and it would be nice
to resolve them before we move onwards.
Diffstat (limited to 'arch/s390/Kconfig')
0 files changed, 0 insertions, 0 deletions