From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 12 Oct 2017 13:51:24 +0000 (+0100)
Subject: Merge version 2.4.82-1+rpi1 and 2.4.83-1 to produce 2.4.83-1+rpi1
X-Git-Tag: raspbian/2.4.83-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2754547c2692d584d67180e6a91da5d5c723195;p=libdrm.git

Merge version 2.4.82-1+rpi1 and 2.4.83-1 to produce 2.4.83-1+rpi1
---

4cfec9425d8103506dc1b52bb24f5109f4c43c40
diff --cc debian/changelog
index 8a7ab02,5e18d58..f9425f0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- libdrm (2.4.82-1+rpi1) buster-staging; urgency=medium
++libdrm (2.4.83-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.4.74-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 28 Jun 2017 21:14:42 +0000]
 +  * Move valgrind to build-conflicts, the old version in raspbian breaks the build.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Aug 2017 02:27:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Oct 2017 13:51:24 +0000
++
+ libdrm (2.4.83-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 03 Oct 2017 11:15:26 +0300
  
  libdrm (2.4.82-1) unstable; urgency=medium