From: Dave Airlie <airlied@redhat.com>
Date: Mon, 27 Aug 2012 06:22:20 +0000 (+1000)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~20^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93bb70e0c00f1be4cc857e4d8375c44058cce71e;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into drm-next

There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/intel_modes.c
---

93bb70e0c00f1be4cc857e4d8375c44058cce71e
Reading git-diff-tree failed