OSDN Git Service

Merge branch 'nouveau-1'
authorDave Airlie <airlied@optimus.localdomain>
Tue, 19 Dec 2006 23:30:16 +0000 (10:30 +1100)
committerDave Airlie <airlied@linux.ie>
Tue, 19 Dec 2006 23:30:16 +0000 (10:30 +1100)
commite5c4a26a29a9af301cb8b0aebbba84e70f995b83
tree3eba66ce42ce7c3d2d9ced2d726b9ca5d553843a
parent3b7508d1bf2c78f19d882beffa6d8b4f58bd19a8
parentdc1b68aacbfc8d53d78f7388e0e52da1747a1f71
Merge branch 'nouveau-1'
linux-core/Makefile
linux-core/drm_fops.c