Linus Torvalds 3cfc2c42c1 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ...

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
  Documentation: update broken web addresses.
  fix comment typo "choosed" -> "chosen"
  hostap:hostap_hw.c Fix typo in comment
  Fix spelling contorller -> controller in comments
  Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
  fs/Kconfig: Fix typo Userpace -> Userspace
  Removing dead MACH_U300_BS26
  drivers/infiniband: Remove unnecessary casts of private_data
  fs/ocfs2: Remove unnecessary casts of private_data
  libfc: use ARRAY_SIZE
  scsi: bfa: use ARRAY_SIZE
  drm: i915: use ARRAY_SIZE
  drm: drm_edid: use ARRAY_SIZE
  synclink: use ARRAY_SIZE
  block: cciss: use ARRAY_SIZE
  comment typo fixes: charater => character
  fix comment typos concerning "challenge"
  arm: plat-spear: fix typo in kerneldoc
  reiserfs: typo comment fix
  update email address
  ...

2010-08-04 15:31:02 -07:00

..

apparmor

AppArmor: fix build warnings for non-const use of get_task_cred

2010-08-02 15:49:00 +10:00

integrity/ima

ima: use generic_file_llseek for securityfs

2010-08-02 15:34:58 +10:00

keys

KEYS: Reinstate lost passing of process keyring ID in call_sbin_request_key()

2010-08-02 15:34:56 +10:00

selinux

selinux: convert the policy type_attr_map to flex_array

2010-08-02 15:38:39 +10:00

smack

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-08-04 15:31:02 -07:00

tomoyo

TOMOYO: Use pathname specified by policy rather than execve()

2010-08-02 15:38:38 +10:00

capability.c

Security: capability: code style issue

2010-08-02 15:35:00 +10:00

commoncap.c

security: whitespace coding style fixes

2010-04-23 10:10:23 +10:00

device_cgroup.c

Merge branch 'master' into next

2010-05-06 10:56:07 +10:00

inode.c

securityfs: Drop dentry reference count when mknod fails

2010-08-02 15:34:59 +10:00

Kconfig

AppArmor: Enable configuring and building of the AppArmor security module

2010-08-02 15:38:34 +10:00

lsm_audit.c

Merge branch 'master' into next

2010-05-06 10:56:07 +10:00

Makefile

AppArmor: Enable configuring and building of the AppArmor security module

2010-08-02 15:38:34 +10:00

min_addr.c

mmap_min_addr check CAP_SYS_RAWIO only for write

2010-04-23 08:56:31 +10:00

security.c

LSM: Remove unused arguments from security_path_truncate().

2010-08-02 15:33:40 +10:00