glamor: Changes to 'master'

[Adam Jackson]

On Thu, 2013-09-26 at 14:28 -0700, Zhigang Gong wrote:

> commit 0bf74791b93cd6a96ef0ba95c0e17bcf9aba5834
> Author: Zhigang Gong <zhigang.gong at linux.intel.com>
> Date:   Fri Sep 27 05:25:54 2013 +0800
> 
>     Shoud return null subpixmap if we fail to get a valid map address.
>     
>     The patch is prepared by Raul Fernandes.

In the future please use "git commit --author=..." to correctly
attribute authorship.

>     Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86693

This is not a valid bugzilla number.

- ajax