]> 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)
commitac390792ce34e67ccbc8af4ad35c9ddff9902c89
tree37f64c68c02b46a3ffdba17284b7a74932e8b246
parent0e72d952cf042b4b92a26fd1f325d127c670ede9
parent81de1b2066792e2dde7f073ec68d795cdfd298b9
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