OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/security/apparmor/include
History
Linus Torvalds 008d23e485 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: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
 		2011-01-13 10:05:56 -08:00
..
apparmor.h AppArmor: misc. base functions and defines 2010-08-02 15:35:11 +10:00
apparmorfs.h AppArmor: userspace interfaces 2010-08-02 15:35:13 +10:00
audit.h AppArmor: basic auditing infrastructure. 2010-08-02 15:35:11 +10:00
capability.h AppArmor: mediation of non file objects 2010-08-02 15:38:35 +10:00
context.h AppArmor: contexts used in attaching policy to system objects 2010-08-02 15:35:12 +10:00
domain.h AppArmor: functions for domain transitions 2010-08-02 15:35:14 +10:00
file.h headers: path.h redux 2011-01-10 08:51:44 -08:00
ipc.h AppArmor: mediation of non file objects 2010-08-02 15:38:35 +10:00
match.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
path.h AppArmor: misc. base functions and defines 2010-08-02 15:35:11 +10:00
policy.h AppArmor: core policy routines 2010-08-02 15:38:37 +10:00
policy_unpack.h AppArmor: policy routines for loading and unpacking policy 2010-08-02 15:38:36 +10:00
procattr.h AppArmor: userspace interfaces 2010-08-02 15:35:13 +10:00
resource.h AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes 2010-09-08 09:19:29 +10:00
sid.h AppArmor: core policy routines 2010-08-02 15:38:37 +10:00