Merge branch 'master'
Steven Whitehouse [Mon, 3 Apr 2006 13:08:57 +0000 (09:08 -0400)]
1  2 
fs/Makefile
include/linux/fs.h
kernel/printk.c

diff --cc fs/Makefile
Simple merge
Simple merge
diff --cc kernel/printk.c
Simple merge