From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Aug 2014 23:04:59 +0000 (+1000)
Subject: Merge tag 'v3.16' into drm-next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~125^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d42f82a9b8c5168d75cf59307cd271feca94464;p=pandora-kernel.git

Merge tag 'v3.16' into drm-next

Linux 3.16

backmerge requested by i915, nouveau and radeon authors

Conflicts:
	drivers/gpu/drm/i915/i915_gem_render_state.c
	drivers/gpu/drm/i915/intel_drv.h
---

5d42f82a9b8c5168d75cf59307cd271feca94464
Reading git-diff-tree failed