diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-23 18:13:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-23 18:13:34 -0800 |
| commit | 34e3f91b4e66e52b3e189b2f778bd37d68963ca8 (patch) | |
| tree | 83e7a0a2d1865ad413ac76a7a0883d4ed3d52dc8 /net/lapb/lapb_in.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring. (diff) | |
| download | linux-dev-34e3f91b4e66e52b3e189b2f778bd37d68963ca8.tar.xz linux-dev-34e3f91b4e66e52b3e189b2f778bd37d68963ca8.zip | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.
drm/nv50: fix vram ptes on IGPs to point at stolen system memory
drm/nv50: fix instmem binding on IGPs to point at stolen system memory
drm/nv50: improve vram page table construction
drm/nv50: more efficient clearing of gpu page table entries
drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram
drm/nouveau: Fix up pre-nv17 analog load detection.
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions