diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-10-22 17:50:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-10-22 17:50:50 +1000 |
| commit | ae168d973f5fa3f3467dc5600f74a0f03e3cafe7 (patch) | |
| tree | 30e8e4544a0ac22866d97eb19d0e96cd323e9387 /drivers/watchdog | |
| parent | 64acba6a7adfe8be2e28b7e903092db685328a08 (diff) | |
| parent | 5e5a195ecc8cc0280d169d6da33c959df6336e9f (diff) | |
| download | linux-ae168d973f5fa3f3467dc5600f74a0f03e3cafe7.tar.gz | |
Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Fixes from Ben, off note: ACPI ROM regression fix, some IGP and AGP regressions fixes from rework fallout. * 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/clock: fix missing pll type/addr when matching default entry drm/nouveau/fb: fix reporting of memory type on GF8+ IGPs drm/nv41/vm: don't init hw pciegart on boards with agp bridge drm/nouveau/bios: fetch full 4KiB block to determine ACPI ROM image size drm/nouveau: validate vbios size drm/nouveau: warn when trying to free mm which is still in use drm/nouveau: fix nouveau_mm/nouveau_mm_node leak drm/nouveau/bios: improve error handling when reading the vbios from ACPI drm/nouveau: handle same-fb page flips
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions