diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-09-11 14:38:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-09-11 14:38:36 +1000 |
| commit | 9fbcc7c007ea200357e2453c6b2b153646fbc165 (patch) | |
| tree | bd62c75ab322a26380c20771e308207e264dd4d8 /drivers/watchdog | |
| parent | d1031d576d7398ab2e2fce53796d733c5be13d64 (diff) | |
| parent | 778613e583994d947960a7f177226d0e7b5ef124 (diff) | |
Merge branch 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
three nouveau regression fixes.
* 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/device: enable c800 quirk for tecra w50
drm/nouveau/clk/gt215: Unbreak engine pausing for GT21x/MCP7x
drm/nouveau/gr/nv04: fix big endian setting on gr context
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions