Merge master.kernel.org:/home/mochel/BK/linux-2.5-linus

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc drivers/base/Makefile
index 12518e7465431479cc32327378fd0f394882c9b6,a20768fa96305349058e207c636bac90b7f1f08c..bd239b1274841dbe31deef88bbd8cc9f31e5edb2
--- 1/drivers/base/Makefile
--- 2/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@@ -1,7 -1,8 +1,8 @@@
 -O_TARGET      := base.o
 +# Makefile for the Linux device tree
  
- obj-y         := core.o sys.o interface.o fs.o power.o bus.o 
+ obj-y         := core.o sys.o interface.o fs.o power.o bus.o \
+                       driver.o 
  
- export-objs   := core.o fs.o power.o sys.o bus.o
+ export-objs   := core.o fs.o power.o sys.o bus.o driver.o
  
  include $(TOPDIR)/Rules.make