diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-19 06:36:08 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-19 06:36:08 -0800 |
| commit | 0a191749ce19112f8f20675232b951dccd4ae00e (patch) | |
| tree | b81540374236beb22d50daaa856910257c0e6e2d /drivers/gpu/drm/nouveau/nouveau_hwmon.h | |
| parent | c765a6dfad10b857e9681d7c4dec375ebe78db8a (diff) | |
| parent | accb884b32e82f943340688c9cd30290531e73e0 (diff) | |
Merge branch 'char-misc-linus' into char-misc-next
We want the mei change here to allow future mei patches to apply
properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_hwmon.h')
0 files changed, 0 insertions, 0 deletions