summaryrefslogtreecommitdiff
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-03 18:52:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-03 18:52:09 -0700
commitd2af6768f6128a682e7490d04e2f3d660bd6fb76 (patch)
tree6f25a84cd251a605b103111d1bd615bfb13b9ae2 /fs/nfs/dir.c
parentcce2c56e7666199916525907dc817209dd58287c (diff)
parent8aeb96f80232e9a701b5c4715504f4c9173978bd (diff)
downloadlinux-3.10-d2af6768f6128a682e7490d04e2f3d660bd6fb76.tar.gz
linux-3.10-d2af6768f6128a682e7490d04e2f3d660bd6fb76.tar.bz2
linux-3.10-d2af6768f6128a682e7490d04e2f3d660bd6fb76.zip
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: fix gart setup on fusion parts (v2) drm: Send pending vblank events before disabling vblank. drm/radeon: fix regression on atom cards with hardcoded EDID record. drm/radeon/kms: add some new pci ids
Diffstat (limited to 'fs/nfs/dir.c')
0 files changed, 0 insertions, 0 deletions