Merge bk://linuxusb.bkbits.net/devfs-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

diff --cc drivers/ide/hd.c
index 31de0290cd7938f0afc411450bf8197f7cf8bcd5,40d9ef4b0ebf7bb0a37fe730da202328d53814d3..6441cad4816ba95ea62a44d4e8dc3d264481e13d
--- 1/drivers/ide/hd.c
--- 2/drivers/ide/hd.c
+++ b/drivers/ide/hd.c
@@@ -31,8 -35,8 +31,7 @@@
  #include <linux/sched.h>
  #include <linux/timer.h>
  #include <linux/fs.h>
- #include <linux/devfs_fs_kernel.h>
  #include <linux/kernel.h>
 -#include <linux/hdreg.h>
  #include <linux/genhd.h>
  #include <linux/slab.h>
  #include <linux/string.h>

diff --cc drivers/ide/ide-tape.c
Simple merge

diff --cc drivers/ide/probe.c
Simple merge