diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:38:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:38:16 -0400 |
commit | 98b96173c777c67daaa7d163a35e591e1928a164 (patch) | |
tree | 0530429db1328a00b89972ca67d15e1b61e66ba8 /drivers/char/watchdog/wdt.c | |
parent | cf8ba7a95511b86608acb481ad96219fe2da4b3a (diff) | |
parent | 881ba59d4685b28433bf313b6db51672a02696a3 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] sworks-agp: Switch to PCI ref counting APIs
[AGPGART] Nvidia AGP: Use refcount aware PCI interfaces
[AGPGART] Fix sparse warning in sgi-agp.c
[AGPGART] Intel-agp adjustments
[AGPGART] Move [un]map_page_into_agp into asm/agp.h
[AGPGART] Add missing calls to global_flush_tlb() to ali-agp
[AGPGART] prevent probe collision of sis-agp and amd64_agp
Diffstat (limited to 'drivers/char/watchdog/wdt.c')
0 files changed, 0 insertions, 0 deletions