diff options
| author |   Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 16:18:46 +0100 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 16:18:46 +0100 |
| commit | 018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 (patch) | |
| tree | fadde2521591998dc653fa094c636e8a547e620d /samples/hw_breakpoint | |
| parent | perf_event, amd: Fix spinlock initialization (diff) | |
| parent | Linux 2.6.33 (diff) | |
| download | linux-dev-018cbffe6819f6f8db20a0a3acd9bab9bfd667e4.tar.xz linux-dev-018cbffe6819f6f8db20a0a3acd9bab9bfd667e4.zip | |
Merge commit 'v2.6.33' into perf/core
Merge reason:
__percpu annotations need the corresponding sparse address
space definition upstream.
Conflicts:
tools/perf/util/probe-event.c (trivial)
Diffstat (limited to 'samples/hw_breakpoint')
0 files changed, 0 insertions, 0 deletions