]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6...
authorDave Airlie <airlied@redhat.com>
Thu, 13 Nov 2014 20:24:50 +0000 (06:24 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 13 Nov 2014 20:24:50 +0000 (06:24 +1000)
commitf9e5838ff8f3cdead0d6a217f56a6020bfb055f2
tree37f64c68c02b46a3ffdba17284b7a74932e8b246
parent0c895d70c59e34046833540898f3bab3a95c550d
parent57b51486f525c8d53dbad011ebbbc3cbc73f9987
Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

One modesetting, one gk20a fix.

* 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/nv50/disp: Fix modeset on G94
  drm/gk20a/fb: fix setting of large page size bit