tree 4a2dd158ac377671fbc58032f42cd9109306348d
parent 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
parent e412e95a268fa8544858ebfe066826b290430d51
author Dave Airlie <airlied@redhat.com> 1351655164 +1000
committer Dave Airlie <airlied@redhat.com> 1351655169 +1000

Merge branch 'drm-nouveau-fixes' of git://people.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

This covers all known nouveau regressions at the moment, along with a fix
to not steal the console on headless GPUs.

* 'drm-nouveau-fixes' of git://people.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: headless mode by default if pci class != vga display
  drm/nouveau: resurrect headless mode since rework
  drm/nv50/fb: prevent oops on chipsets without compression tags
  drm/nouveau: allow creation of zero-sized mm
  drm/nouveau/i2c: fix typo when checking nvio i2c port validity
  drm/nouveau: silence modesetting spam on pre-gf8 chipsets