pixman: Branch 'master'

[Matt Turner]

 pixman/pixman-sse2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05560828c495ed9226b43b30e1824447e3d8eff3
Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Sep 21 16:34:24 2012 -0700

    sse2: mark pack_565_2x128_128 as static force_inline

diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index e273a95..cf21ef8 100644
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -146,7 +146,7 @@ pack_565_2packedx128_128 (__m128i lo, __m128i hi)
     return _mm_packs_epi32 (t0, t1);
 }
 
-__m128i
+static force_inline __m128i
 pack_565_2x128_128 (__m128i lo, __m128i hi)
 {
     __m128i data;