diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
| commit | c602c65b2f81d14456771d1e3f15d1381f4b7efa (patch) | |
| tree | f1f833c8dd6c1519eeb101be32f7fe54a9605af5 /tools/perf/util/exec_cmd.c | |
| parent | 3834f47291df475be3f0f0fb7ccaa098967cc054 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into sfi-release
Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c
Signed-off-by: Len Brown <len.brown@intel.com>
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; |