OSDN Git Service

Merge remote-tracking branch 'mesa/master' into froyo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 7 Apr 2011 08:48:00 +0000 (16:48 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 7 Apr 2011 08:48:00 +0000 (16:48 +0800)
1  2 
intel/intel_bufmgr_gem.c
tests/modetest/modetest.c

Simple merge
Simple merge