summaryrefslogtreecommitdiffstats
path: root/drivers/telephony
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-29 22:49:29 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-29 22:49:29 +0200
commit82991c6f2c361acc17279b8124d9bf1878973435 (patch)
tree6c74acf89f3c5f3c9b7f8817e56675bca818c5d3 /drivers/telephony
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentMerge ../linus (diff)
downloadlinux-82991c6f2c361acc17279b8124d9bf1878973435.tar.xz
linux-82991c6f2c361acc17279b8124d9bf1878973435.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] Make AGP depend on PCI [AGPGART] remove unused variable [AGPGART] Fix pci_register_driver checking in amd64-agp [AGPGART] Compile fix for ati-agp [AGPGART] Suspend/Resume support for nVidia nForce AGP. [AGPGART] Suspend/Resume improvements for ATI AGP [AGPGART] Whitespace cleanups for ati-agp
Diffstat (limited to 'drivers/telephony')
0 files changed, 0 insertions, 0 deletions