summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2010-02-27 18:18:46 +0300
committerFrederic Weisbecker <fweisbec@gmail.com>2010-02-27 18:18:46 +0300
commit018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 (patch)
treefadde2521591998dc653fa094c636e8a547e620d /samples
parent1dd2980d990068e20045b90c424518cc7f3657ff (diff)
parent60b341b778cc2929df16c0a504c91621b3c6a4ad (diff)
downloadlinux-018cbffe6819f6f8db20a0a3acd9bab9bfd667e4.tar.xz
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')
0 files changed, 0 insertions, 0 deletions