diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 13:19:07 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 13:19:07 -0700 |
commit | 5584cfbafc1a4c2a465f4423d351bb918c64cad0 (patch) | |
tree | f74dcc1ba5a6790cb3e69629696aff58bdfd827a /tools/perf/config/feature-tests.mak | |
parent | 1653d2f88f43f6780eace1faeeb7b7adde8c10fb (diff) | |
parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
download | linux-stable-5584cfbafc1a4c2a465f4423d351bb918c64cad0.tar.gz linux-stable-5584cfbafc1a4c2a465f4423d351bb918c64cad0.tar.bz2 linux-stable-5584cfbafc1a4c2a465f4423d351bb918c64cad0.zip |
Merge 3.12-rc6 into usb-next.
We want those USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/config/feature-tests.mak')
-rw-r--r-- | tools/perf/config/feature-tests.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/config/feature-tests.mak b/tools/perf/config/feature-tests.mak index d5a8dd44945f..f79305739ecc 100644 --- a/tools/perf/config/feature-tests.mak +++ b/tools/perf/config/feature-tests.mak @@ -219,7 +219,7 @@ define SOURCE_LIBAUDIT int main(void) { - printf(\"error message: %s\n\", audit_errno_to_name(0)); + printf(\"error message: %s\", audit_errno_to_name(0)); return audit_open(); } endef |