From: Alan Cox <alan@linux.intel.com>
Date: Tue, 26 Jul 2011 16:15:50 +0000 (+0100)
Subject: gma500: Fix clashes with DRM updates
X-Git-Tag: v3.1-rc2~15^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f8d92b7779d1f3145cd71552ed8282c8b299772;p=pandora-kernel.git

gma500: Fix clashes with DRM updates

The private object support has migrated from gma500 into the DRM core,
remove our now clashing copy so -next can build.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed