[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mips-cvs
Subject:    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
From:       linux-mips () linux-mips ! org
Date:       2009-03-30 11:23:43
Message-ID: S20052215AbZC3LXr/20090330112347Z+3163202 () ftp ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Sun Mar 29 17:40:36 2009 +0200
Commit: 29914c3cdf61a9c36d7fd27062a4cdc3edbec592
Gitweb: http://www.linux-mips.org/g/linux/29914c3c
Branch: master

---

 Documentation/Smack.txt                    |   42 ++++
 Documentation/feature-removal-schedule.txt |   11 -
 Documentation/kernel-parameters.txt        |    9 -
 fs/compat.c                                |   14 +
 fs/exec.c                                  |   10 -
 fs/internal.h                              |    2 
 fs/proc/base.c                             |   50 ++---
 include/linux/fs_struct.h                  |    5 
 include/linux/security.h                   |   13 -
 include/net/cipso_ipv4.h                   |   17 ++
 include/net/netlabel.h                     |   17 ++
 kernel/futex.c                             |  201 ++++++++------------
 net/ipv4/cipso_ipv4.c                      |  130 ++++++++++++-
 net/ipv4/syncookies.c                      |    9 -
 net/ipv4/tcp_ipv4.c                        |    7 -
 net/netlabel/netlabel_kapi.c               |  165 ++++++++++++++--
 net/socket.c                               |    2 
 security/capability.c                      |    5 
 security/security.c                        |    5 
 security/selinux/hooks.c                   |  207 ++-------------------
 security/selinux/include/netlabel.h        |   27 +--
 security/selinux/netlabel.c                |  186 +++++-------------
 security/selinux/selinuxfs.c               |   68 -------
 security/smack/smack.h                     |   32 +--
 security/smack/smack_access.c              |   66 ++++---
 security/smack/smack_lsm.c                 |  282 ++++++++++++++++------------
 security/smack/smackfs.c                   |  218 +++++++++++++---------
 security/tomoyo/common.h                   |    2 
 28 files changed, 895 insertions(+), 907 deletions(-)

[prev in list] [next in list] [prev in thread] [next in thread]