summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 12:43:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 12:43:49 -0700
commita45fbc33137b11e479ea8b7d478a1d7e6488971b (patch)
tree947b39b8d39acd5db2d3a966921ec76443b9b5eb /fs
parentc813b4e16ead3c3df98ac84419d4df2adf33fe01 (diff)
parenta64d2b37c2259e169759c1701ac565f0a11dc0ea (diff)
downloadlinux-3.10-a45fbc33137b11e479ea8b7d478a1d7e6488971b.tar.gz
linux-3.10-a45fbc33137b11e479ea8b7d478a1d7e6488971b.tar.bz2
linux-3.10-a45fbc33137b11e479ea8b7d478a1d7e6488971b.zip
Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: agp/nvidia: Support agp user-memory on nvidia agp. agp/amd-k7: Suspend support for AMD K7 GART driver agp/intel: Reduce extraneous PCI posting reads during init agp: Fix stolen memory counting on G4X.
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions