| commit | 00fdb75b1959c2f8de8b70bfb63aca422feff2fa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 11 09:47:52 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 11 09:47:52 2010 -0800 |
| tree | fd0422f86149d6cc739be7af324bcbc7a0968f11 | |
| parent | c07d7237a639d57dc91ea7efdbc1b3f85c7a095d [diff] | |
| parent | 3d4a7882b11299104a0e74425dece2e26ac98024 [diff] |
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