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
|
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
|
2011-01-13 10:05:56 -08:00 |
|
integrity/ima
|
ima: fix add LSM rule bug
|
2011-01-03 16:36:33 -08:00 |
|
keys
|
Merge branch 'master' into next
|
2011-01-10 09:46:24 +11:00 |
|
selinux
|
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
|
2011-01-10 11:18:59 -08:00 |
|
smack
|
Merge branch 'master' into next
|
2011-01-10 09:46:24 +11:00 |
|
tomoyo
|
fs: dcache scale d_unhashed
|
2011-01-07 17:50:21 +11:00 |
|
capability.c
|
af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.
|
2011-01-05 15:38:53 -08:00 |
|
commoncap.c
|
capabilities/syslog: open code cap_syslog logic to fix build failure
|
2010-11-15 15:40:01 -08:00 |
|
device_cgroup.c
|
Merge branch 'master' into next
|
2010-05-06 10:56:07 +10:00 |
|
inode.c
|
convert get_sb_single() users
|
2010-10-29 04:16:28 -04:00 |
|
Kconfig
|
keys: add new key-type encrypted
|
2010-11-29 08:55:29 +11: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
|
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
|
2011-01-07 08:56:33 -08:00 |