Merge master.kernel.org:/home/mochel/BK/linux-2.5-linus
authorLinus Torvalds <torvalds@home.transmeta.com>
Wed, 29 May 2002 02:17:44 +0000 (19:17 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Wed, 29 May 2002 02:17:44 +0000 (19:17 -0700)
commit155aba2e4c3d4e459218a7bbdbc908df60bc8d67
tree7e92e3981ea19af931a4e511b774f4c29f17be51
parent22cd4c11916be7d4f5e3634362fc10763d60a759
parent21a16f65b95259e28e99eb81977c790e77133ffb
Merge kernel.org:/home/mochel/BK/linux-2.5-linus
into home.transmeta.com:/home/torvalds/v2.5/linux
drivers/base/Makefile