summaryrefslogtreecommitdiffstats
path: root/arch/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-09-23 08:02:09 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-23 08:02:09 +0200
commitd0303d71c2fb9bcb90a8d48e6462c78c86f70ce6 (patch)
tree2aa6702ee7c153d909a820ae9fda14d35877e59e /arch/Kconfig
parent90edf27fb89241917e91155bfdcc7c8e5a587222 (diff)
parentc79bd89282136a4516e842fa542d6abf902ddeac (diff)
downloadop-kernel-dev-d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6.zip
op-kernel-dev-d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6.tar.gz
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 'arch/Kconfig')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud