Merge branch 'master' into gfs2
authorSteven Whitehouse <swhiteho@redhat.com>
Tue, 29 Aug 2006 15:39:34 +0000 (11:39 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Tue, 29 Aug 2006 15:39:34 +0000 (11:39 -0400)
commit83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18
tree5ba3bbbe977c2047658b41e22d6b2abd5686bf15
parent8638460540749ddb1beca9e9a68d655a6fe6df65
parentd96299537e43681942ea272e00b0e529aa5b5fa4
Merge branch 'master' into gfs2
CREDITS
MAINTAINERS
include/linux/fs.h
include/linux/kernel.h