summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-30 22:05:31 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-30 22:05:31 +0100
commit7bbc67fbf60b698b43692fc6ea16c526bf1c5e26 (patch)
tree35b4c929ecea3d3fc54f221501a25c136bd6b1a6 /kernel/power
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentftrace: prevent recursion (diff)
downloadlinux-7bbc67fbf60b698b43692fc6ea16c526bf1c5e26.tar.xz
linux-7bbc67fbf60b698b43692fc6ea16c526bf1c5e26.zip
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: prevent recursion tracing, doc: update mmiotrace documentation x86, mmiotrace: fix buffer overrun detection function tracing: fix wrong position computing of stack_trace
Diffstat (limited to 'kernel/power')
0 files changed, 0 insertions, 0 deletions