Merge master.kernel.org:/home/davem/BK/sparc-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 5 Apr 2002 01:23:07 +0000 (17:23 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 5 Apr 2002 01:23:07 +0000 (17:23 -0800)
commitbd4370a0814076561a8d2ed6e9df028eb429942e
tree0a519988613c32ba83f7946fa14249e8ef2c3edf
parent4c7f178f0cf3649bb7dd12f6ed2cb373aec80a77
parent925aba562ccab6fbdbac1017988bb5470bc6d78e
Merge master.kernel.org:/home/davem/BK/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux