From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 25 Aug 2007 15:01:53 +0000 (-0700)
Subject: Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: MMI-PSA29.97-13-9~40647
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ae26fa468533c86aaa6936fd366142fcf01386f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp: balance ioremap checks
  agp: Add device id for P4M900 to via-agp module
  efficeon-agp leaks 'struct agp_bridge_data' in error paths of agp_efficeon_probe()
---

6ae26fa468533c86aaa6936fd366142fcf01386f