summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-02 22:37:35 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-02 22:37:35 +0100
commitfdfa66ab455c79d699833c43ac0e09900133fd7c (patch)
tree5ede20eaf13eab51c3a391e002a4e9988aa3e787 /include
parent4387d6d6b8a74722bf1f6fc3e29dd2a84cc1d1c2 (diff)
parentacdb2c287916ce247c09d460266370af45da55c5 (diff)
parent340430c572f7b2b275d39965e88bafa71693cb23 (diff)
downloadop-kernel-dev-fdfa66ab455c79d699833c43ac0e09900133fd7c.zip
op-kernel-dev-fdfa66ab455c79d699833c43ac0e09900133fd7c.tar.gz
Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing/core
OpenPOWER on IntegriCloud