diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-07 14:04:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-07 14:04:43 -0800 |
| commit | 06262a6b8cf7999e7c2d756dcea7aabae0ee79a9 (patch) | |
| tree | b59b80498b43035d91fc13b25dfaa66c51e0d882 /include/trace/ftrace.h | |
| parent | fb2b2a1d37f80cc818fd4487b510f4e11816e5e1 (diff) | |
| parent | d344e38b2c151ca5e5e39f562017127e93912528 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, nx: Mark the ACPI resume trampoline code as +x
Diffstat (limited to 'include/trace/ftrace.h')
0 files changed, 0 insertions, 0 deletions