Merge branch 'master'
Steven Whitehouse [Fri, 31 Mar 2006 20:34:58 +0000 (15:34 -0500)]
1  2 
Documentation/ioctl-number.txt
fs/Kconfig
fs/Makefile
include/linux/fs.h
include/linux/kernel.h
kernel/printk.c
mm/filemap.c
mm/readahead.c

Simple merge
diff --cc fs/Kconfig
Simple merge
diff --cc fs/Makefile
Simple merge
Simple merge
Simple merge
diff --cc kernel/printk.c
Simple merge
diff --cc mm/filemap.c
Simple merge
diff --cc mm/readahead.c
Simple merge