diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
| commit | 008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch) | |
| tree | 81c88f744f6f3fc84132527c1ddc0b4da410c5e2 /security | |
| parent | 8f685fbda43deccd130d192c9fcef1444649eaca (diff) | |
| parent | bfc672dcf323877228682aff79dff8ecd9f30ff8 (diff) | |
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.
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/include/match.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h index 19ba16e8aac..a4a863997bd 100644 --- a/security/apparmor/include/match.h +++ b/security/apparmor/include/match.h | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | * The format used for transition tables is based on the GNU flex table | 28 | * The format used for transition tables is based on the GNU flex table |
| 29 | * file format (--tables-file option; see Table File Format in the flex | 29 | * file format (--tables-file option; see Table File Format in the flex |
| 30 | * info pages and the flex sources for documentation). The magic number | 30 | * info pages and the flex sources for documentation). The magic number |
| 31 | * used in the header is 0x1B5E783D insted of 0xF13C57B1 though, because | 31 | * used in the header is 0x1B5E783D instead of 0xF13C57B1 though, because |
| 32 | * the YY_ID_CHK (check) and YY_ID_DEF (default) tables are used | 32 | * the YY_ID_CHK (check) and YY_ID_DEF (default) tables are used |
| 33 | * slightly differently (see the apparmor-parser package). | 33 | * slightly differently (see the apparmor-parser package). |
| 34 | */ | 34 | */ |