]> 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)
commite16588175e3f1cc18bd00539bda1e15bb56b9011
tree3a956a8488c05d13110145f6d9db88e67858f0ae
parent0be6d93c08e2dc0ab76c1ff3c568fd4e8ba94841
parent6e77b1e44d53d6715c0e2dee8823189b0b91e4c8
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