diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-19 09:14:35 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-19 09:14:35 -0800 |
commit | bcf8951fc23476c9190a7df0bc501ff47d0c3a61 (patch) | |
tree | 0bab4c8ee082bd2eec9478c484a3d451abafede2 /net/ipv6/ip6_flowlabel.c | |
parent | f54b2fe4aef9aa74ddf2c856928c3e29f3371fe7 (diff) | |
parent | 07db1c140eb233971341396e492cc73d4280e698 (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, mce: fix ifdef for 64bit thermal apic vector clear on shutdown
x86, mce: use force_sig_info to kill process in machine check
x86, mce: reinitialize per cpu features on resume
x86, rcu: fix strange load average and ksoftirqd behavior
Diffstat (limited to 'net/ipv6/ip6_flowlabel.c')
0 files changed, 0 insertions, 0 deletions