diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-04 12:14:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-04 12:14:46 -0700 |
commit | b8ec322784f732562902503d70bf1f5e907b28c0 (patch) | |
tree | f7ceda585fa4f0d7954d704b9ddebd982985963e /include/net/sock.h | |
parent | 2165f631f0e1d4e9a1ee425ef05cb727352285e0 (diff) | |
parent | cc65f1ec192dc54de57483194502e9fa00934c39 (diff) | |
download | blackbird-op-linux-b8ec322784f732562902503d70bf1f5e907b28c0.tar.gz blackbird-op-linux-b8ec322784f732562902503d70bf1f5e907b28c0.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 setup: correct segfault in generation of 32-bit reloc kernel
Diffstat (limited to 'include/net/sock.h')
0 files changed, 0 insertions, 0 deletions