Merge hera.kernel.org:/home/torvalds/BK/linux-2.5
authorPatrick Mochel <mochel@hera.kernel.org>
Wed, 3 Apr 2002 11:26:07 +0000 (03:26 -0800)
committerPatrick Mochel <mochel@hera.kernel.org>
Wed, 3 Apr 2002 11:26:07 +0000 (03:26 -0800)
commit43f5feae00fc641f940a3f8e6e5e55c8dcbd9164
tree7f4550bf49737e435014aeae11eab243c18c4c9b
parent5e4b50795ee8c7659a1181cea4c98712e02ea63e
parent450329de7e192d6ff2321139408176d0f11205f8
Merge hera.kernel.org:/home/torvalds/BK/linux-2.5
into hera.kernel.org:/home/mochel/BK/linux-2.5
include/linux/device.h