diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2008-07-20 21:19:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2008-07-20 21:19:17 -0700 |
| commit | 734b397cd14f3340394a8dd3266bec97d01f034b (patch) | |
| tree | 0ac0ff92b1e8420992ab01af7fdf4459f59c9551 /fs/lockd/svc4proc.c | |
| parent | ipv6: Fix warning in addrconf code. (diff) | |
| parent | gpu: re-order GPU subdirectory vs char for AGP vs DRM startup. (diff) | |
| download | linux-734b397cd14f3340394a8dd3266bec97d01f034b.tar.gz linux-734b397cd14f3340394a8dd3266bec97d01f034b.tar.bz2 linux-734b397cd14f3340394a8dd3266bec97d01f034b.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:
gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.
Diffstat (limited to 'fs/lockd/svc4proc.c')
0 files changed, 0 insertions, 0 deletions