diff options
author | Dave Airlie <airlied@redhat.com> | 2010-12-22 09:48:04 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-12-22 09:48:04 +1000 |
commit | 1d99e5c57255d188773fb437391df24fe8faf575 (patch) | |
tree | 25300afe457342c6d694de18020c804486a10eac /net/can | |
parent | 880981e49b90568ebb53428e231b43b8c1049ef9 (diff) | |
parent | 183720b8af5301e2eab7f3163f03133c5a6ad6da (diff) | |
download | linux-3.10-1d99e5c57255d188773fb437391df24fe8faf575.tar.gz linux-3.10-1d99e5c57255d188773fb437391df24fe8faf575.tar.bz2 linux-3.10-1d99e5c57255d188773fb437391df24fe8faf575.zip |
Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-core-next
* 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next:
drm/nvc0: accelerate ttm buffer moves
drm/nvc0: initial support for tiled buffer objects
drm/nvc0: implement fbcon acceleration
drm/nvc0: implement pgraph engine hooks
drm/nvc0: implement pfifo engine hooks
drm/nvc0: implement fencing
drm/nvc0: fix channel dma init paths
drm/nvc0: skip dma object creation for drm channel
drm/nvc0: implement channel structure initialisation
drm/nvc0: gpuobj_new need only check validity and init the relevant engine
drm/nvc0: reject the notifier_alloc ioctl
drm/nvc0: create shared channel vm
drm/nvc0: initial vm implementation, use for bar1/bar3 management
drm/nvc0: import initial vm backend
drm/nouveau: modify vm to accomodate dual page tables for nvc0
drm/nv50: add missing license header to nv50_fbcon.c
drm/nv50: fix smatch warning in nv50_vram.c
drm/nouveau: sizeof() vs ARRAY_SIZE()
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions