summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-26 03:47:27 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-26 03:47:27 +0100
commite36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c (patch)
treed591a09c68a4b94f25f59d274fd8aea7ac476393 /arch
parentd7350c3f45694104e820041969c8185c5f99e57c (diff)
parent2d542cf34264ac92e9e7ac55c0b096b066d569d2 (diff)
parent694593e3374a67d95ece6a275a1f181644c2c4d8 (diff)
downloadop-kernel-dev-e36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c.zip
op-kernel-dev-e36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c.tar.gz
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'linus' into tracing/core
OpenPOWER on IntegriCloud