diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-12 05:35:13 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-12 05:35:13 +0200 |
commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /tools/perf/util/exec_cmd.c | |
parent | sparc64: Initial niagara2 perf counter support. (diff) | |
parent | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
download | linux-cabc5c0f7fa1342049042d6e147db5a73773955b.tar.xz linux-cabc5c0f7fa1342049042d6e147db5a73773955b.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'tools/perf/util/exec_cmd.c')
-rw-r--r-- | tools/perf/util/exec_cmd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/exec_cmd.c b/tools/perf/util/exec_cmd.c index 34a352867382..2745605dba11 100644 --- a/tools/perf/util/exec_cmd.c +++ b/tools/perf/util/exec_cmd.c @@ -6,7 +6,6 @@ #define MAX_ARGS 32 -extern char **environ; static const char *argv_exec_path; static const char *argv0_path; |