| commit | 018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 | [log] [tgz] |
|---|---|---|
| author | Frederic Weisbecker <fweisbec@gmail.com> | Sat Feb 27 16:18:46 2010 +0100 |
| committer | Frederic Weisbecker <fweisbec@gmail.com> | Sat Feb 27 16:18:46 2010 +0100 |
| tree | fadde2521591998dc653fa094c636e8a547e620d | |
| parent | 1dd2980d990068e20045b90c424518cc7f3657ff [diff] | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad [diff] |
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)