Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_types.cpp
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/s_expression.cpp
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c

1 files changed, 4 insertions, 2 deletions

diff --git a/mesalib/src/glsl/ast_function.cpp b/mesalib/src/glsl/ast_function.cpp
index c35e06089..fad069135 100644
--- a/mesalib/src/glsl/ast_function.cpp
+++ b/mesalib/src/glsl/ast_function.cpp
@@ -62,8 +62,10 @@ process_parameters(exec_list *instructions, exec_list *actual_parameters,
  *

  * \param return_type Return type of the function.  May be \c NULL.

  * \param name        Name of the function.

- * \param parameters  Parameter list for the function.  This may be either a

- *                    formal or actual parameter list.  Only the type is used.

+ * \param parameters  List of \c ir_instruction nodes representing the

+ *                    parameter list for the function.  This may be either a

+ *                    formal (\c ir_variable) or actual (\c ir_rvalue)

+ *                    parameter list.  Only the type is used.

  *

  * \return

  * A ralloced string representing the prototype of the function.