Merge branch 'i965_h264'
authorXiang, Haihao <haihao.xiang@intel.com>
Tue, 8 Jun 2010 01:53:02 +0000 (09:53 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Tue, 8 Jun 2010 01:53:02 +0000 (09:53 +0800)
commit4eed8bcc33fb821fc7fb4d714a9ada43955f1f46
treea2cca52cec7364f349313930850164239bb689ac
parent3a359ea535bcd301c79eeb09015105423d04b229
parentda6e7fd052baa080f11fab45ef83ecca4b600df9
Merge branch 'i965_h264'

Conflicts:
va/x11/dri2_util.c
configure.ac
va/x11/dri2_util.c