Merge commit 'v2.6.35' into perf/core
Ingo Molnar [Mon, 2 Aug 2010 06:29:56 +0000 (08:29 +0200)]
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c

Merge reason: Resolve the conflicts and update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
MAINTAINERS
Makefile
drivers/cpufreq/cpufreq.c
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
scripts/package/Makefile
tools/perf/util/hist.c
tools/perf/util/symbol.c

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1569,10 -1489,11 +1571,12 @@@ static int map_groups__set_modules_path
                                 dir_name, dent->d_name);
  
                        long_name = strdup(path);
-                       if (long_name == NULL)
-                               goto failure;
+                       if (long_name == NULL) {
+                               ret = -1;
+                               goto out;
+                       }
                        dso__set_long_name(map->dso, long_name);
 +                      map->dso->lname_alloc = 1;
                        dso__kernel_module_get_build_id(map->dso, "");
                }
        }