Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@gmail.com>
Wed, 26 Sep 2012 08:36:55 +0000 (18:36 +1000)
committerDave Airlie <airlied@gmail.com>
Wed, 26 Sep 2012 08:36:55 +0000 (18:36 +1000)
commit4f20d9ebb9c2a6b5db3d187595cbf437ee81d135
tree97dca5725a5b8b7c95bebf327266d1d10a62dda6
parent6f0f9b6b3fcfe5e156f20d4f804f0d505c750b3c
parent79eee7aa0d4de5a42331c63d3c7c735248b53d0c
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