| commit | fdfe6d3d000775b50fb1adbc278ba0a34c3007c7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 20 12:37:55 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 20 12:37:55 2008 -0700 |
| tree | 1d8f90f6be657cd7de16692474d9e85d7bc2f92d | |
| parent | 1f1e2ce8a55bac60ff165d353c6b882e750c9092 [diff] | |
| parent | 7d15ddf79ec35ce79093832c80b86c0888eb5bce [diff] |
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/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.