Merge branch 'omapdrm-next' of git://people.freedesktop.org/~robclark/linux into...
authorDave Airlie <airlied@redhat.com>
Tue, 19 Feb 2013 02:01:55 +0000 (12:01 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 19 Feb 2013 02:01:55 +0000 (12:01 +1000)
* 'omapdrm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/omap: remove fbdev debug enter/leave hooks
  omapdrm: simplify locking in the fb debugfs file
  omapdrm: only take crtc->mutex in crtc callbacks
  drm/omap: move out of staging
  staging/omapdrm: Use kmemdup rather than duplicating its implementation
  staging: omapdrm/omap_gem_dmabuf.c: fix memory leakage
  drm/omap: Add OMAP5 support
  drm/omap: Add PM capabilities


Trivial merge