Merge branch 'master' into vaapi-ext
authorXiang, Haihao <haihao.xiang@intel.com>
Tue, 11 Oct 2011 05:38:09 +0000 (13:38 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Tue, 11 Oct 2011 05:38:09 +0000 (13:38 +0800)
1  2 
configure.ac
src/gen6_mfd.c
src/gen7_mfd.c

diff --cc configure.ac
Simple merge
diff --cc src/gen6_mfd.c
Simple merge
diff --cc src/gen7_mfd.c
Simple merge