Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 9a448b47400c..8c72d888e449 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -62,6 +62,13 @@ static struct thread *thread__new(pid_t pid)
         return self;
 }
 
+void thread__delete(struct thread *self)
+{
+        map_groups__exit(&self->mg);
+        free(self->comm);
+        free(self);
+}
+
 int thread__set_comm(struct thread *self, const char *comm)
 {
         int err;