Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/auxiliary/util/Makefile

diff --cc progs/trivial/.gitignore
Simple merge

diff --cc src/gallium/auxiliary/util/Makefile
index f611f82773aee9ea12abd92e116ed5a5c4ffbf60,5c227c1eb5419d57b879fdb84c855ceb1b66b2f1..6773ed73cff978584ea5c36ee689add311addb4a
--- 1/src/gallium/auxiliary/util/Makefile
--- 2/src/gallium/auxiliary/util/Makefile
+++ b/src/gallium/auxiliary/util/Makefile
@@@ -10,8 -11,7 +11,9 @@@ C_SOURCES = 
        u_gen_mipmap.c \
        u_handle_table.c \
        u_hash_table.c \
+       u_hash.c \
 +      u_keymap.c \
 +      u_linear.c \
        u_math.c \
        u_mm.c \
        u_rect.c \

diff --cc src/gallium/auxiliary/util/SConscript
index 8a04955a16ef27f7849b37fb3bc1537a5b72deac,1ef06631bf3e7c3411cb9a58d621d99e4f457cf5..f5bd308083b400426b8c854f7810366ddd89d408
--- 1/src/gallium/auxiliary/util/SConscript
--- 2/src/gallium/auxiliary/util/SConscript
+++ b/src/gallium/auxiliary/util/SConscript
@@@ -10,8 -11,8 +11,9 @@@ util = env.ConvenienceLibrary
                'u_draw_quad.c',
                'u_gen_mipmap.c',
                'u_handle_table.c',
+               'u_hash.c',
                'u_hash_table.c',
 +              'u_keymap.c',
                'u_math.c',
                'u_mm.c',
                'u_rect.c',

diff --cc src/gallium/auxiliary/util/u_memory.h
Simple merge