diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 23:29:21 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 23:29:21 +0100 |
commit | 404cbbd52f10d1d5719ad82ce8ba903890779255 (patch) | |
tree | b589594e2891f3dbdccdea87233c917d338001df /kernel/perf_event.c | |
parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | x86: Clear irqstack thread_info (diff) | |
download | linux-404cbbd52f10d1d5719ad82ce8ba903890779255.tar.xz linux-404cbbd52f10d1d5719ad82ce8ba903890779255.zip |
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: Clear irqstack thread_info
x86: Make relocatable kernel work with new binutils
Diffstat (limited to 'kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions