summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-11 18:47:52 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-11 18:47:52 +0100
commit00fdb75b1959c2f8de8b70bfb63aca422feff2fa (patch)
treefd0422f86149d6cc739be7af324bcbc7a0968f11 /scripts
parentMerge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff)
parentagp/hp: fail gracefully if we don't find an IOC (diff)
downloadlinux-00fdb75b1959c2f8de8b70bfb63aca422feff2fa.tar.xz
linux-00fdb75b1959c2f8de8b70bfb63aca422feff2fa.zip
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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions