diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 09:22:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 09:22:32 -0800 |
commit | 34f10fc9886450c2e8a336f7022805c4a73e10f1 (patch) | |
tree | 199a5a2b728dab33e48f5d680ad3486024ce324d /include/linux/can.h | |
parent | 67171a3f0335f2ecd1723851e75a0af7e2115f25 (diff) | |
parent | 87d034f3139b5f0d93df2ba58f37d6f2c2c7eeb6 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86/xen: fix DomU boot problem
x86: not set node to cpu_to_node if the node is not online
x86, i387: fix ptrace leakage using init_fpu()
Diffstat (limited to 'include/linux/can.h')
0 files changed, 0 insertions, 0 deletions