Merge branch 'bw/trace-no-inline-getnanotime'

No file-scope static variables in an inlined function, please. * bw/trace-no-inline-getnanotime: trace.c: do not mark getnanotime() as "inline"

Junio C Hamano committed Oct 16, 2014 at 14:16 UTC c11dc64722fc0bb496efb1b6de87012a132c04fc

No changes.