505c750b3c
parent 79eee7aa0d4de5a42331c63d3c7c735248b53d0c
author Dave Airlie <airlied@gmail.com> 1348648615 +1000
committer Dave Airlie <airlied@gmail.com> 1348648615 +1000

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

These just silence some printks that we are seeing that we shouldn't

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nvc0/ltcg: mask off intr 0x10
  drm/nouveau: silence a debug message triggered by newer userspace
ÒÂÊ„˜)x