]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 04:07:35 +0000 (15:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 04:07:35 +0000 (15:07 +1100)
commitc9d57aad669f423020cb5ac1dd292f519b467d10
tree691aecad31bf155689a8f2f15312bbe074ff9edd
parentde84cbc2c00bcafe3180172d0481a59ea239c183
parent1fcc155351f183e5044180eeb372a8ff47710855
Merge remote-tracking branch 'ftrace/for-next'
kernel/trace/blktrace.c
kernel/trace/trace_irqsoff.c