aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-12 18:53:04 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-12 18:53:04 -0800
commit3641b536ecc56f68fe182ac99f7ddc4827125118 (patch)
tree8bb025f9e981588c09aeb13b1a7c117036c4e703 /include
parentMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband (diff)
parentMerge ../linus (diff)
downloadlinux-dev-3641b536ecc56f68fe182ac99f7ddc4827125118.tar.xz
linux-dev-3641b536ecc56f68fe182ac99f7ddc4827125118.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] VIA and SiS AGP chipsets are x86-only [AGPGART] agp-amd64: section mismatches with HOTPLUG=n [AGPGART] Fix up misprogrammed bridges with incorrect AGPv2 rates.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions