Merge branch 'modesetting-gem'
authorJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 9 Dec 2008 18:23:43 +0000 (10:23 -0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 9 Dec 2008 18:23:43 +0000 (10:23 -0800)
1  2 
libdrm/Makefile.am

Simple merge