diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-12-23 08:22:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-23 08:22:22 +1000 |
| commit | 2e33054e4429339c24f88f9aab91991d85174698 (patch) | |
| tree | 5a825962849f6749da8d29dfdbbb6a5faebd02fb /arch/x86/include/uapi/asm/ldt.h | |
| parent | Merge branch 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux into drm-fixes (diff) | |
| parent | drm/atomic: fix potential null ptr on plane enable (diff) | |
| download | linux-dev-2e33054e4429339c24f88f9aab91991d85174698.tar.xz linux-dev-2e33054e4429339c24f88f9aab91991d85174698.zip | |
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
Diffstat (limited to 'arch/x86/include/uapi/asm/ldt.h')
0 files changed, 0 insertions, 0 deletions