merge
authorGreg Kroah-Hartman <greg@kroah.com>
Mon, 22 Jul 2002 07:06:28 +0000 (00:06 -0700)
committerGreg Kroah-Hartman <greg@kroah.com>
Mon, 22 Jul 2002 07:06:28 +0000 (00:06 -0700)
commitf121b8fca19b1b805255d5bd0a6247ad0cbe812a
tree28afb661a9a58f4572b9410b018751ccd99d5a75
parenta8bffd28269fc6efe1d4b8ce347091221bc2aa59
parente175ac64b5edef3fa804d6cdb0f1e10ddb4b81a8
merge
drivers/char/tty_io.c
fs/namei.c
include/linux/fs.h
security/capability.c
security/dummy.c