]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into...
authorDave Airlie <airlied@redhat.com>
Wed, 29 Jul 2015 07:21:38 +0000 (17:21 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 29 Jul 2015 07:21:38 +0000 (17:21 +1000)
commit50002f2f197a6d7f6bca5023be67bac33a05823e
tree3a956a8488c05d13110145f6d9db88e67858f0ae
parentc43592ae8dd4448749ec8170e253f9d82b343f02
parent2b0072bcdf4e3662af093eef587f32ed4b5d08d1
Merge branch 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Two more nouveau fixes.

* 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/nouveau/ttm: fix tiled system memory with Maxwell
  drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads