diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-24 17:48:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-24 17:48:43 -0400 |
| commit | abb1cf3cb9532d824c8bda00a111adb106dd457d (patch) | |
| tree | fd62d48b5057e36a476a8aa80ff5ea3fe337b4da /include/asm-um/vm-flags-i386.h | |
| parent | b464f5794619bbe98a92e1bc4180986e39615ac4 (diff) | |
| parent | c499aeb08cb24bed60e5bfc80720597bcf1a720d (diff) | |
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: radeon constify radeon microcode
Add i915 ioctls to configure pipes for vblank interrupt.
drm: update radeon to 1.25 add r200 vertex program support
drm: radeon add a tcl state flush before accessing tcl vector space
Diffstat (limited to 'include/asm-um/vm-flags-i386.h')
0 files changed, 0 insertions, 0 deletions