]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bcrlbits.bkbits.net/linux-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Tue, 5 Mar 2002 07:12:17 +0000 (23:12 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Tue, 5 Mar 2002 07:12:17 +0000 (23:12 -0800)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1  2 
arch/i386/kernel/entry.S

Simple merge