[Glibc-bsd-commits] r5414 - trunk/kfreebsd-10/debian/patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-02-04 21:27:53 +0000 (Tue, 04 Feb 2014)
New Revision: 5414

Modified:
   trunk/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff
   trunk/kfreebsd-10/debian/patches/series
Log:
Merged (rev 261497).

Modified: trunk/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff	2014-02-03 23:51:19 UTC (rev 5413)
+++ trunk/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff	2014-02-04 21:27:53 UTC (rev 5414)
@@ -1,8 +1,6 @@
 
-This is an attempt at an equivalent, portable version of:
+Merged (rev 261497).
 
-http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch?revision=20909&view=co
-
 --- a/sys/dev/drm2/radeon/r600.c
 +++ b/sys/dev/drm2/radeon/r600.c
 @@ -3012,6 +3012,12 @@

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2014-02-03 23:51:19 UTC (rev 5413)
+++ trunk/kfreebsd-10/debian/patches/series	2014-02-04 21:27:53 UTC (rev 5414)
@@ -1,9 +1,9 @@
 # Patches from (or merged in) upstream
 si_status_wait6.diff
 accept_O_CLOEXEC_in_shm_open.diff
+radeonkms_abort_nofw.diff
 
 # Patches that are in good shape for merging upstream
-radeonkms_abort_nofw.diff
 mount_remount.diff
 
 # Other patches that might or might not be mergeable