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 /drivers/char/rio/pci.h | |
| parent | 702beb87d6b4e08cca394b210679e5d7c2ac9383 (diff) | |
| parent | e6b51632b3579d96ce5aa1b3efdeceedd2921a2c (diff) | |
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 'drivers/char/rio/pci.h')
0 files changed, 0 insertions, 0 deletions