Merge branch 'fifo-cleanup' into upstream-master
authorBen Skeggs <skeggsb@gmail.com>
Tue, 13 Nov 2007 18:09:07 +0000 (05:09 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Tue, 13 Nov 2007 18:09:07 +0000 (05:09 +1100)
commiteb5487b9ca1d7ce60d5ddc784089d91cf176f439
tree55309717d95b69223a6c1c815286196c47ccd70c
parent2370ded79b4176d76cda1ec5f495fd33c2d566ed
parent7c1e59fb0c5043d3d369f5feb8e195a6a3da3457
Merge branch 'fifo-cleanup' into upstream-master
shared-core/nouveau_drv.h
shared-core/nouveau_fifo.c
shared-core/nouveau_state.c