From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 3 Feb 2012 22:12:42 +0000 (+0100)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v3.4-rc1~175^2~91
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972c5ae961d6e5103e2b33d935cfa4145fd47140;p=pandora-kernel.git

Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)
---

972c5ae961d6e5103e2b33d935cfa4145fd47140
Reading git-diff-tree failed