OSDN Git Service

Merge branch 'master' into staging
authorXiang, Haihao <haihao.xiang@intel.com>
Wed, 22 Feb 2012 02:23:29 +0000 (10:23 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Wed, 22 Feb 2012 02:23:29 +0000 (10:23 +0800)
commit7489dba422068f75ee89742e686caa1ce657922c
tree3873e14c4641e4ca17d158eee3f1cd82efef1440
parentd0cf73ad1dc66a8fa5911acb837c08604cc51940
parent383f865ae42385f9c26886de6034b095176e0dd7
Merge branch 'master' into staging

Conflicts:
src/i965_drv_video.c
configure.ac
src/gen7_mfd.c
src/i965_drv_video.c