Merge branch 'master' of ssh://git@moblin.intel.com/umg-moorestown-libva

Conflicts:
	va/va.c
	va/va_trace.c

Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/va/va.c b/va/va.c
index 93fda7a..3c26bc3 100644
--- a/va/va.c
+++ b/va/va.c
@@ -67,7 +67,11 @@ extern int trace_flag;
  * return 0: the "env" is set, and the value is copied into env_value
  *        1: the env is not set
  */
+<<<<<<< HEAD:va/va.c
 int va_parseConfig(char *env, char *env_value)
+=======
+int psb_parse_config(char *env, char *env_value)
+>>>>>>> 319fd55aa578fdf92e4516fb856326f6bf23d4eb:va/va.c
 {
     char *token, *value, *saveptr;
     char oneline[1024];