Merge branch 'tracing/ftrace' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 09:20:47 +0000 (10:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 09:20:47 +0000 (10:20 +0100)
commitc4ef144a9d0803eb0a2d4110ae87e7f34e667ded
treeb4b5e472bafb3d5d0d8ea26680e1d8cc87365c30
parenta1be621dfacbef0fd374d8acd553d71e07bf29ac
parentefed792d6738964f399a508ef9e831cd60fa4657
Merge branch 'tracing/ftrace' into tracing/core