Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Fri, 21 Apr 2006 16:52:36 +0000 (12:52 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Fri, 21 Apr 2006 16:52:36 +0000 (12:52 -0400)
commita748422ee45725e04e1d3792fa19dfa90ddfd116
tree978e12895468baaa9f7ab2747b9f7d50beaf1717
parentc63e31c2cc1ec67372920b5e1aff8204d04dd172
parentf4ffaa452e71495a06376f12f772342bc57051fc
Merge branch 'master'
fs/Kconfig
include/linux/fs.h
include/linux/kernel.h