diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-26 00:48:05 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-26 00:48:05 +0200 |
commit | 22fa8d59be28affbecc6ae87abf528aebeebff24 (patch) | |
tree | 1aba231d9d1dc41670183241ff04f22ae8ac5037 /net/sctp | |
parent | Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block (diff) | |
parent | x86: fix bogus KERN_ALERT on oops (diff) | |
download | linux-22fa8d59be28affbecc6ae87abf528aebeebff24.tar.xz linux-22fa8d59be28affbecc6ae87abf528aebeebff24.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix bogus KERN_ALERT on oops
x86: lguest build fix
x86: fix CONFIG_KEXEC build breakage
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions