From: Dave Airlie <airlied@redhat.com>
Date: Mon, 30 Apr 2012 06:26:16 +0000 (+0100)
Subject: drm/edid: fix collision between two patches breaking build
X-Git-Tag: v3.5-rc1~83^2~87
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2baf8377997cce10bb730f306392f29794dea217;p=pandora-kernel.git

drm/edid: fix collision between two patches breaking build

this fixes a report that the new load code needed to be updated for
ajax's validity changes.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

Reading git-diff-tree failed