Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:37:55 +0000 (12:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:37:55 +0000 (12:37 -0700)
commitfdfe6d3d000775b50fb1adbc278ba0a34c3007c7
tree1d8f90f6be657cd7de16692474d9e85d7bc2f92d
parent1f1e2ce8a55bac60ff165d353c6b882e750c9092
parent7d15ddf79ec35ce79093832c80b86c0888eb5bce
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]: fixup chipset flush for new Intel G4x.
  agp: brown paper bag patch - put back the two lines it took out.