Merge home.transmeta.com:/home/torvalds/v2.5/viro

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

diff --cc Documentation/filesystems/porting
Simple merge

diff --cc drivers/block/ll_rw_blk.c
Simple merge

diff --cc drivers/cdrom/cdrom.c
Simple merge

diff --cc drivers/scsi/sr.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/partitions/check.c
index 36fc86dcff3e12114cf703422890a688bacd6a24,2c5ef516b1c55d9537ba0ddee72d6f3fa71d69d6..b4ba922cffeb3709148692c822f4e2f84c0c177d
--- 1/fs/partitions/check.c
--- 2/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@@ -13,16 -13,10 +13,11 @@@
   *  Added needed MAJORS for new pairs, {hdi,hdj}, {hdk,hdl}
   */
  
- #include <linux/config.h>
+ #include <linux/init.h>
  #include <linux/fs.h>
- #include <linux/genhd.h>
- #include <linux/kernel.h>
- #include <linux/major.h>
  #include <linux/blk.h>
- #include <linux/init.h>
- #include <linux/raid/md.h>
  #include <linux/buffer_head.h>        /* for invalidate_bdev() */
 +#include <linux/kmod.h>
  
  #include "check.h"
  

diff --cc fs/proc/array.c
Simple merge

diff --cc include/linux/buffer_head.h
Simple merge

diff --cc include/linux/cdrom.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/ksyms.c
Simple merge