summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 09:17:32 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 09:17:32 -0800
commit2e9abdd9bad485970b37cd53a82f92702054984c (patch)
tree8f473a59aae906e65d0f78bbc98a8db12401d5d2 /net
parentc36cd16f78a5dd740a619ef8445e35a73484d58b (diff)
parent9d1f6b28ee2429a1f94a9f7074ffae7f918d33be (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] x86_64: Enable VIA AGP driver on x86-64 for VIA P4 chipsets [AGPGART] x86_64: Fix wrong PCI ID for ALI M1695 AGP bridge [AGPGART] ATI RS350 support. [AGPGART] Lots of CodingStyle/whitespace cleanups.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions