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)
commitfbb303ed9aa88c8f8466cce24368dadf474d3e08
tree4f76a96cf6bda028ee05db7fa84cb3a63b1fd8c6
parentf9efd27107dce2ef306fbea8197c81309d721cb9
parentb9c7c1d9b52385332b7c64b5bd25f926ed66bd39
Merge branch 'master' into vaapi-ext
configure.ac
src/gen6_mfd.c
src/gen7_mfd.c