From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Jan 2010 17:47:52 +0000 (-0800)
Subject: Merge branch 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.33-rc4~16
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=00fdb75b1959c2f8de8b70bfb63aca422feff2fa

Merge branch 'agp-fixes' of git://git./linux/kernel/git/airlied/agp-2.6

* 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp/hp: fail gracefully if we don't find an IOC
  agp/hp: fixup hp agp after ACPI changes
  agp: correct missing cleanup on error in agp_add_bridge
---

00fdb75b1959c2f8de8b70bfb63aca422feff2fa