[libdrm: 3/3] Merge branch 'f18'

[Adam Jackson]

commit 5ebdcd8118e8217cfa613792daa6d6afc561fe24
Merge: 74074e7 3a92839
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Oct 8 11:00:08 2012 -0400

    Merge branch 'f18'

 libdrm.spec        |   16 +++++--
 radeon-prime.patch |  106 ----------------------------------------------------
 2 files changed, 11 insertions(+), 111 deletions(-)
---
diff --cc libdrm.spec
index 666fc0b,12edcf1..9759aa3
--- a/libdrm.spec
+++ b/libdrm.spec
@@@ -65,8 -65,9 +65,9 @@@ autoreconf -v --install || exit 
  %configure \
  %ifarch %{arm}
          --enable-omap-experimental-api \
+ 	--enable-exynos-experimental-api \
  %endif
 -	--enable-udev --disable-libkms
 +	--enable-udev
  make %{?_smp_mflags}
  pushd tests
  make %{?smp_mflags} `make check-programs`
@@@ -181,14 -184,12 +188,13 @@@ don
  %endif
  %{_libdir}/pkgconfig/libdrm_radeon.pc
  %{_libdir}/pkgconfig/libdrm_nouveau.pc
 +%{_libdir}/pkgconfig/libkms.pc
  
  %changelog
- * Thu Sep 06 2012 Adam Jackson <ajax at redhat.com> 2.4.39-2
- - Re-enable libkms until vmwgfx properly grows dumb bo support.  Please don't
-   use it though.
+ * Mon Oct 08 2012 Adam Jackson <ajax at redhat.com> 2.4.39-3
+ - Add exynos to arm
  
- * Wed Aug 29 2012 Adam Jackson <ajax at redhat.com> 2.4.39-1
+ * Mon Aug 27 2012 Dave Airlie <airlied at redhat.com> 2.4.39-1
  - upstream 2.4.39 release
  
  * Tue Aug 14 2012 Dave Airlie <airlied at redhat.com> 2.4.38-2