From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 03:22:09 +0000 (+1000)
Subject: Merge remote-tracking branch 'drm/drm-next'
X-Git-Tag: next-20130628~67
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1ce9c6bc5e944e93101b5f1c06c93ef76fc424f7;p=karo-tx-linux.git

Merge remote-tracking branch 'drm/drm-next'

Conflicts:
	drivers/gpu/drm/drm_vm.c
---

1ce9c6bc5e944e93101b5f1c06c93ef76fc424f7