libX11: Changes to 'master'

[Alan Coopersmith]

 modules/om/generic/omGeneric.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f0286b2770ece10aef5e2e8c004260217f12fd25
Author: Bhavi Dhingra <b.dhingra at samsung.com>
Date:   Thu Jun 4 19:07:12 2015 -0700

    omGeneric.c: Correct the parameter usage of sizeof
    
    Incorrect parameter usage with sizeof. Earlier passed argument FontData
    will be 4 bytes always as its a pointer hence the change is needed and
    FontDataRec should be used for memset.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>