Merge commit 'origin/master'

diff --git a/Makefile b/Makefile
index ecfb4cc..d8298f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ WEBFETCH                := wget
 SHA1SUM                        := sha1sum
 
 ALL                    += iproute2
-iproute2-URL            := http://devresources.linuxfoundation.org/dev/iproute2/download/iproute2-2.6.37.tar.bz2
-iproute2-SHA1SUM        := 7852fb66fb745dc3c1fabee24d7d8ff017c48d36
+iproute2-URL            := http://devresources.linuxfoundation.org/dev/iproute2/download/iproute2-2.6.38.tar.bz2
+iproute2-SHA1SUM        := e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a 
 iproute2               := $(notdir $(iproute2-URL))
 
 all: $(ALL)

diff --git a/iproute.spec b/iproute.spec
index b0b066a..19624c2 100644 (file)
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,5 +1,5 @@
 %define name iproute
-%define version 2.6.37
+%define version 2.6.38
 %define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}