]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/davem/sparc-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 2 Jun 2004 16:41:55 +0000 (09:41 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 2 Jun 2004 16:41:55 +0000 (09:41 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
kernel/compat.c

diff --cc kernel/compat.c
Simple merge