aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-25 15:48:05 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-25 15:48:05 -0700
commit22fa8d59be28affbecc6ae87abf528aebeebff24 (patch)
tree1aba231d9d1dc41670183241ff04f22ae8ac5037 /net
parent7f1495745347bc2cb9cc4f50d0a889caeb71f1f1 (diff)
parenteec407c9ac5ee819bfcadb4e39ce892576d570d1 (diff)
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')
0 files changed, 0 insertions, 0 deletions