[libdrm/f16: 2/2] Merge branch 'master' into f16

[Adam Jackson]

commit 27cd24a0c702419a6d6006901472db278a217f7b
Merge: da0082e ce498b7
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Nov 11 16:32:04 2011 -0500

    Merge branch 'master' into f16

 91-drm-modeset.rules |    2 +-
 libdrm.spec          |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---