Linus Torvalds
f429ee3b80
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)
audit: no leading space in audit_log_d_path prefix
audit: treat s_id as an untrusted string
audit: fix signedness bug in audit_log_execve_info()
audit: comparison on interprocess fields
audit: implement all object interfield comparisons
audit: allow interfield comparison between gid and ogid
audit: complex interfield comparison helper
audit: allow interfield comparison in audit rules
Kernel: Audit Support For The ARM Platform
audit: do not call audit_getname on error
audit: only allow tasks to set their loginuid if it is -1
audit: remove task argument to audit_set_loginuid
audit: allow audit matching on inode gid
audit: allow matching on obj_uid
audit: remove audit_finish_fork as it can't be called
audit: reject entry,always rules
audit: inline audit_free to simplify the look of generic code
audit: drop audit_set_macxattr as it doesn't do anything
audit: inline checks for not needing to collect aux records
audit: drop some potentially inadvisable likely notations
...
Use evil merge to fix up grammar mistakes in Kconfig file.
Bad speling and horrible grammar (and copious swearing) is to be
expected, but let's keep it to commit messages and comments, rather than
expose it to users in config help texts or printouts.
2012-01-17 16:41:31 -08:00
..
alchemy
Merge branch 'next/alchemy' into mips-for-linux-next
2012-01-11 15:42:10 +01:00
ar7
Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next
2012-01-11 15:42:31 +01:00
ath79
Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next
2012-01-11 15:42:31 +01:00
bcm47xx
MIPS: Fix up inconsistency in panic() string argument.
2011-12-07 22:01:45 +00:00
bcm63xx
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
boot
MIPS: Alchemy: Basic support for the DB1300 board.
2011-12-07 22:02:06 +00:00
cavium-octeon
Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next
2012-01-11 15:42:31 +01:00
cobalt
configs
Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next
2012-01-11 15:42:31 +01:00
dec
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
emma
MIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check
2011-11-08 12:35:29 +00:00
fw
include /asm
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit
2012-01-17 16:41:31 -08:00
jazz
Merge branch 'next/generic' into mips-for-linux-next
2012-01-11 15:41:47 +01:00
jz4740
MIPS: Fix up inconsistency in panic() string argument.
2011-12-07 22:01:45 +00:00
kernel
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit
2012-01-17 16:41:31 -08:00
lantiq
Merge branch 'next/generic' into mips-for-linux-next
2012-01-11 15:41:47 +01:00
lasat
lib
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
loongson
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
math-emu
MIPS Kprobes: Refactor branch emulation
2011-12-07 22:04:03 +00:00
mipssim
mm
Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next
2012-01-11 15:42:31 +01:00
mti-malta
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
netlogic
MIPS: Netlogic: Mark Netlogic chips as SMT capable
2011-12-07 22:04:57 +00:00
oprofile
pci
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
pmc-sierra
Merge branch 'next/generic' into mips-for-linux-next
2012-01-11 15:41:47 +01:00
pnx833x
pnx8550
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
power
powertv
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
rb532
mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE
2011-10-31 19:30:57 -04:00
sgi-ip22
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
sgi-ip27
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
sgi-ip32
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
sibyte
MIPS: Sibyte: drop select of SIBYTE_CFE
2011-11-13 21:27:34 +01:00
sni
MIPS: irq: Remove IRQF_DISABLED
2011-12-07 22:03:45 +00:00
txx9
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
vr41xx
mips: fix implicit smp.h usage in various files.
2011-10-31 19:30:55 -04:00
wrppmc
Kbuild
Kbuild.platforms
Kconfig
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
Kconfig.debug
Makefile
MIPS: BMIPS: Add CFLAGS, Makefile entries for BMIPS
2011-12-07 22:03:17 +00:00