Merge changes from sid up to 3.13.6-1

svn path=/dists/trunk/linux-tools/; revision=21177

debian/build/drivers/staging/usbip/Makefile

@@ -19,6 +19,6 @@ install:
 	$(MAKE) -C userspace install
 
 clean:
-	rm -rf $(addprefix $(srcdir)/,autom4te.cache aclocal.m4 config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing)
+	rm -rf $(addprefix $(srcdir)/,autom4te.cache aclocal.m4 compile config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing)
 	find $(srcdir)/ -name Makefile.in -delete
 	rm -rf userspace

debian/build/tools/perf/Makefile

@@ -46,6 +46,13 @@ endif
 install:
 ifdef KERNEL_ARCH_PERF
 	+$(MAKE_PERF) -C $(top_srcdir)/tools/perf -f Makefile.perf O=$(CURDIR)/out install VERSION=$(VERSION)
+# Don't install a 'trace' alias yet:
+# - We need a wrapper for it anyway, so there's little point adding a
+#   versioned link
+# - It doesn't work out-of-the-box as non-root (it depends on debugfs),
+#   so it's less widely useful than strace
+# - 'perf trace' doesn't take much more typing
+	rm -f $(DESTDIR)/usr/bin/trace_$(VERSION)
 endif
 
 clean:

debian/changelog

@@ -4,6 +4,21 @@ linux-tools (3.14~rc7-1~exp1) experimental; urgency=medium
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 17 Mar 2014 19:31:14 +0000
 
+linux-tools (3.13.6-1) unstable; urgency=medium
+
+  * New upstream stable update:
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.13.5
+    - Modpost: fixed USB alias generation for ranges including 0x9 and 0xA
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.13.6
+    - perf trace: Fix ioctl 'request' beautifier build problems on
+      !(i386 || x86_64) arches
+
+  [ Ben Hutchings ]
+  * linux-tools: Remove the 'trace_3.13' link to perf
+  * Clean another autoconf-generated file so double-builds work
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Wed, 19 Mar 2014 22:33:21 +0000
+
 linux-tools (3.13.4-1) unstable; urgency=medium
 
   * New upstream stable update: