Merge master.kernel.org:/home/davem/BK/sparc-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Tue, 2 Apr 2002 09:04:13 +0000 (01:04 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Tue, 2 Apr 2002 09:04:13 +0000 (01:04 -0800)
commitde466adfe7378e07e3b37767d39df1d1aee98d89
tree863f1825ea899b5144cc641af9be46a1bfaf00b8
parentee2b6d37e5ab4245e01bdbb93ff88139de8dfcc2
parent7048ea4d1541ff1d36920b1c0c90bd11f5ee1a9f
Merge master.kernel.org:/home/davem/BK/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux