summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-16 09:12:42 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-16 09:12:42 +0100
commit7243f2145a9b06e5cf9a49fc9b8b9a4fff6fb42e (patch)
tree50b73e168e0e8b711d5e1ca8878389464d6c905c /mm
parentb478b782e110fdb4135caa3062b6d687e989d994 (diff)
parent62395efdb0ef42e664ca81677901268c403a6286 (diff)
parent5bee17f18b595937e6beafeee5197868a3f74a06 (diff)
Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core
Conflicts: arch/parisc/kernel/irq.c