Merge branch 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
commit00fdb75b1959c2f8de8b70bfb63aca422feff2fa
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2010 17:47:52 +0000 (11 09:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2010 17:47:52 +0000 (11 09:47 -0800)
treefd0422f86149d6cc739be7af324bcbc7a0968f11
parentc07d7237a639d57dc91ea7efdbc1b3f85c7a095d
parent3d4a7882b11299104a0e74425dece2e26ac98024
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