diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-23 08:02:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-23 08:02:09 +0200 |
| commit | d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6 (patch) | |
| tree | 2aa6702ee7c153d909a820ae9fda14d35877e59e /Makefile | |
| parent | 90edf27fb89241917e91155bfdcc7c8e5a587222 (diff) | |
| parent | c79bd89282136a4516e842fa542d6abf902ddeac (diff) | |
| download | linux-stable-d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6.tar.gz linux-stable-d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6.tar.bz2 linux-stable-d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6.zip | |
Merge branch 'linus' into perf/core
Conflicts:
arch/sparc/kernel/perf_event.c
Merge reason: Resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions