Merge branch 'modesetting-101' into modesetting-gem
authorJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 13 Aug 2008 17:09:41 +0000 (10:09 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 13 Aug 2008 17:09:41 +0000 (10:09 -0700)
1  2 
linux-core/nv50_kms_wrapper.c

Simple merge