Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Mon, 17 Jul 2006 13:25:26 +0000 (09:25 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 17 Jul 2006 13:25:26 +0000 (09:25 -0400)
commit4bf311ddfbffe12d41ad1a3c311ab727db6f72cb
tree9d19a2774e83637d86dc876f3af22af1dacf0bec
parent597d0cae0f99f62501e229bed50e8149604015bb
parent82d6897fefca6206bca7153805b4c5359ce97fc4
Merge branch 'master'
CREDITS
MAINTAINERS
fs/Kconfig
include/linux/fs.h
include/linux/kernel.h