diff options
author | 2009-03-12 21:12:46 -0400 | |
---|---|---|
committer | 2009-03-12 21:12:46 -0400 | |
commit | 51b643b404827d8fde60d7953773a42d46ca87e0 (patch) | |
tree | ae71fcbd8b3640b68fc11e1dca620a8ee96bac5f /include/linux/kernel.h | |
parent | ring-buffer: only allocate buffers for online cpus (diff) | |
parent | Merge branch 'core/locking' into tracing/ftrace (diff) | |
download | wireguard-linux-51b643b404827d8fde60d7953773a42d46ca87e0.tar.xz wireguard-linux-51b643b404827d8fde60d7953773a42d46ca87e0.zip |
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/ftrace-merge
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions