diff options
| author | Linus Torvalds | 2008-02-05 09:54:10 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2008-02-05 09:54:10 -0800 |
| commit | 9914712e2e0f80ddcc00c928d3f7a5848d925e1e (patch) | |
| tree | 08862da0b2c7f20d920acddb5df157e17e0da234 /block/genhd.c | |
| parent | 488823f114a3cef58e7eb932cac977440a2a59cb (diff) | |
| parent | bc894606e8843808c232319f69c26c18f6eaa662 (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: remove flush_agp_mappings calls from new flush handling code
intel-agp: introduce IS_I915 and do some cleanups..
[intel_agp] fix name for G35 chipset
intel-agp: fixup resource handling in flush code.
intel-agp: add new chipset ID
agp: remove unnecessary pci_dev_put
agp: remove uid comparison as security check
fix AGP warning
agp/intel: Add chipset flushing support for i8xx chipsets.
intel-agp: add chipset flushing support
agp: add chipset flushing support to AGP interface
Diffstat (limited to 'block/genhd.c')
0 files changed, 0 insertions, 0 deletions