Merge branch 'master' into vaapi-ext
authorXiang, Haihao <haihao.xiang@intel.com>
Mon, 19 Sep 2011 07:33:59 +0000 (15:33 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Mon, 19 Sep 2011 07:33:59 +0000 (15:33 +0800)
commit397b303bf5ad4e7c1997d0fa3a879ba5e254ec9d
treef1d5f58076e61a1244a273a3e5cb18ac04af6b9e
parentbb437a188c2daa00c7b9146e1a05167f14224133
parent0a12163d1ebaffebd186b1eb1eb95d7895037734
Merge branch 'master' into vaapi-ext

Conflicts:
src/i965_drv_video.c
src/gen6_mfd.c
src/gen7_mfd.c
src/gen7_mfd.h
src/i965_drv_video.c