]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'topic/atomic-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Mon, 22 Dec 2014 22:22:22 +0000 (08:22 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 22 Dec 2014 22:22:22 +0000 (08:22 +1000)
commit2e33054e4429339c24f88f9aab91991d85174698
tree5a825962849f6749da8d29dfdbbb6a5faebd02fb
parent955f6be8ec6adfb44cb07bb3e60d875426710535
parent4b08eae52f2f73723dbc4dd4d251eb60a7d8c0e1
Merge tag 'topic/atomic-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Yeah a pull for one patch is a bit overkill but I started to assemble the
various patches for 3.20 in a branch for atomic props/ioctl and didn't
realize that this bugfix here at the beginnning of the branch should be in
3.19 (because msm is using the helpers arleady). So if you'd merge we'd
have it twice or or I need to shuffle branches again. Can do if you want.

* tag 'topic/atomic-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel:
  drm/atomic: fix potential null ptr on plane enable