From: Dave Airlie <airlied@redhat.com>
Date: Fri, 10 Jul 2015 05:59:35 +0000 (+1000)
Subject: Merge tag 'omapdrm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2d28b633c3fa8f53b919a5de86eb1c8e78dde818;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'omapdrm-4.2-fixes' of git://git./linux/kernel/git/tomba/linux into drm-fixes

omapdrm fixes for 4.2

Small fixes for omapdrm, including:
* Fix packed 24 bit color formats
* Ensure the planes are inside the crtc
* Handle out-of-dma-memory error

* tag 'omapdrm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  drm/omap: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN
  drm/omap: fix align_pitch() for 24 bits per pixel
  drm/omap: fix omap_gem_put_paddr() error handling
  drm/omap: fix omap_framebuffer_unpin() error handling
  drm/omap: increase DMM transaction timeout
  drm/omap: check that plane is inside crtc
  drm/omap: return error if dma_alloc_writecombine fails
---

2d28b633c3fa8f53b919a5de86eb1c8e78dde818