Merge branches 'tracing/ftrace' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Feb 2009 13:33:31 +0000 (14:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Feb 2009 13:33:31 +0000 (14:33 +0100)
commit43769f10b4826376cbf4ce17af74a5b4e8dc4fcd
tree8a7f36985f9ef8e6771163c751eeefd22ee71693
parentae7462b4f1fe1f36b5d562dbd5202a2eba01f072
parenteda58a85ec3fc05855a26654d97a2b53f0e715b9
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
MAINTAINERS