summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-29 05:34:31 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-29 15:41:32 +0100
commit7a78a1722380dd3cb5a009dbcd007f92b6b87743 (patch)
tree87d1f54d566ddd0428f92095572d72a680faa989 /net
parentx86 merge fallout: uml (diff)
downloadlinux-7a78a1722380dd3cb5a009dbcd007f92b6b87743.tar.xz
linux-7a78a1722380dd3cb5a009dbcd007f92b6b87743.zip
more x86 merge fallout (uml, again)
arch/i386/{Kconfig,Makefile}.cpu got moved Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions