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