diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-26 01:04:03 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-26 01:04:03 +0200 |
| commit | c0ee755fc57319a623e0d9ef839cf8fb26ce8d60 (patch) | |
| tree | 727fe78a158757f75b54d7e037b383ad6a39843c /drivers/block/osdblk.c | |
| parent | Linux 3.17-rc2 (diff) | |
| parent | drm: Use the type of the array element when reallocating (diff) | |
| download | linux-c0ee755fc57319a623e0d9ef839cf8fb26ce8d60.tar.xz linux-c0ee755fc57319a623e0d9ef839cf8fb26ce8d60.zip | |
Merge tag 'topic/core-stuff-2014-08-15' of git://anongit.freedesktop.org/drm-intel into drm-next
So small drm stuff all over for 3.18. Biggest one is the cmdline parsing
from Chris with a few fixes from me to make it work for stupid kernel
configs.
Plus the atomic prep series.
Tested for more than a week in -nightly and Ville/Imre indeed discovered
some fun which is now fixed (and i915 vblank patches postponed since the
fixups need this branch plus drm-intel-next merged together).
* tag 'topic/core-stuff-2014-08-15' of git://anongit.freedesktop.org/drm-intel:
drm: Use the type of the array element when reallocating
drm: Don't return 0 for a value used as a denominator
drm: Docbook fixes
drm/irq: Implement a generic vblank_wait function
drm: Add a plane->reset hook
drm: trylock modest locking for fbdev panics
drm: Move ->old_fb from crtc to plane
drm: Handle legacy per-crtc locking with full acquire ctx
drm: Move modeset_lock_all helpers to drm_modeset_lock.[hc]
drm: Add drm_plane/connector_index
drm: idiot-proof vblank
drm: Warn when leaking flip events on close
drm: Perform cmdline mode parsing during connector initialisation
video/fbdev: Always built-in video= cmdline parsing
drm: Don't grab an fb reference for the idr
Diffstat (limited to 'drivers/block/osdblk.c')
0 files changed, 0 insertions, 0 deletions