OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
effdb94
f3384b2
)
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 30 Oct 2008 18:44:09 +0000
(11:44 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 30 Oct 2008 18:44:09 +0000
(11:44 -0700)
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ftrace: fix trace_nop config select
ftrace: perform an initialization for ftrace to enable it
Trivial merge