From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 29 Jul 2016 14:53:50 +0000 (+0200)
Subject: Merge tag 'perf-urgent-for-mingo-20160728' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9ecabeded80b0ea60a75a8ed7df0c90cd36e6a3d;p=linux.git

Merge tag 'perf-urgent-for-mingo-20160728' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

 - Fix the tools/vm/ build by making libapi provide the str_error_c function,
   that libapi uses but wasn't part of the list of objects linked with
   tools/vm/ programs.  (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

9ecabeded80b0ea60a75a8ed7df0c90cd36e6a3d