summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-03 08:25:38 +0300
committerIngo Molnar <mingo@elte.hu>2009-02-03 08:25:38 +0300
commitdc573f9b20c8710105ac35c08ed0fe1da5160ecd (patch)
tree24db0a0f6364b78f9c74e62541d26155e785b8f9 /init
parentb3a8c34886d0e3dd3a24a5b614ee025181da2f41 (diff)
parentecf441b593ac41cb8cd8cd3695110167c42e098c (diff)
parentb1792e367053968f2ddb48bc911d314143ce6242 (diff)
downloadlinux-dc573f9b20c8710105ac35c08ed0fe1da5160ecd.tar.xz
Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core