[xorg-x11-drv-v4l/f22: 3/3] Merge remote-tracking branch 'origin/master' into f22

[Hans de Goede]

commit 9d1040aed5b5d0e9a18402fb6a0f3744f6740c0c
Merge: 188bf7d ad8ef43
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Feb 11 17:48:46 2015 +0100

    Merge remote-tracking branch 'origin/master' into f22

 xf86-video-v4l-0.2.0-build-fix.patch |   14 ++++++++++++++
 xorg-x11-drv-v4l.spec                |    2 ++
 2 files changed, 16 insertions(+), 0 deletions(-)
---