Merge branch 'master' into gfs2
Steven Whitehouse [Tue, 29 Aug 2006 15:39:34 +0000 (11:39 -0400)]
1  2 
CREDITS
MAINTAINERS
include/linux/fs.h
include/linux/kernel.h

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge