Linus Torvalds 95b6886526 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (54 commits) tpm_nsc: Fix bug when loading multiple TPM drivers tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP block tpm: Fix compilation warning when CONFIG_PNP is not defined TOMOYO: Update kernel-doc. tpm: Fix a typo tpm_tis: Probing function for Intel iTPM bug tpm_tis: Fix the probing for interrupts tpm_tis: Delay ACPI S3 suspend while the TPM is busy tpm_tis: Re-enable interrupts upon (S3) resume tpm: Fix display of data in pubek sysfs entry tpm_tis: Add timeouts sysfs entry tpm: Adjust interface timeouts if they are too small tpm: Use interface timeouts returned from the TPM tpm_tis: Introduce durations sysfs entry tpm: Adjust the durations if they are too small tpm: Use durations returned from TPM TOMOYO: Enable conditional ACL. TOMOYO: Allow using argv[]/envp[] of execve() as conditions. TOMOYO: Allow using executable's realpath and symlink's target as conditions. TOMOYO: Allow using owner/group etc. of file objects as conditions. ... Fix up trivial conflict in security/tomoyo/realpath.c		2011-07-27 19:26:38 -07:00
..
debug	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
events	…
gcov	gcov: disable CONSTRUCTORS for UML	2011-07-26 16:49:45 -07:00
irq	devres: fix possible use after free	2011-07-25 20:57:14 -07:00
power	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
time	…
trace	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
.gitignore	…
Kconfig.freezer	…
Kconfig.hz	…
Kconfig.locks	…
Kconfig.preempt	…
Makefile	…
acct.c	…
async.c	…
audit.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
audit.h	…
audit_tree.c	…
audit_watch.c	…
auditfilter.c	…
auditsc.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
backtracetest.c	…
bounds.c	…
capability.c	…
cgroup.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2011-07-27 19:26:38 -07:00
cgroup_freezer.c	…
compat.c	signals: sys_ssetmask/sys_rt_sigsuspend should use set_current_blocked()	2011-07-27 12:53:36 -07:00
configs.c	kernel/configs.c: include MODULE_*() when CONFIG_IKCONFIG_PROC=n	2011-07-25 20:57:15 -07:00
cpu.c	…
cpuset.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
crash_dump.c	…
cred.c	…
delayacct.c	…
dma.c	…
elfcore.c	…
exec_domain.c	…
exit.c	ipc: introduce shm_rmid_forced sysctl	2011-07-26 16:49:44 -07:00
extable.c	…
fork.c	kernel/fork.c: fix a few coding style issues	2011-07-26 16:49:44 -07:00
freezer.c	…
futex.c	mm/futex: fix futex writes on archs with SW tracking of dirty & young	2011-07-25 20:57:11 -07:00
futex_compat.c	…
groups.c	…
hrtimer.c	…
hung_task.c	…
irq_work.c	…
itimer.c	…
jump_label.c	…
kallsyms.c	…
kexec.c	…
kfifo.c	…
kmod.c	…
kprobes.c	…
ksysfs.c	…
kthread.c	…
latencytop.c	…
lockdep.c	…
lockdep_internals.h	…
lockdep_proc.c	…
lockdep_states.h	…
module.c	module: add /sys/module/<name>/uevent files	2011-07-24 22:06:04 +09:30
mutex-debug.c	…
mutex-debug.h	…
mutex.c	…
mutex.h	…
notifier.c	notifiers: sys: move reboot notifiers into reboot.h	2011-07-25 20:57:14 -07:00
nsproxy.c	…
padata.c	…
panic.c	panic: panic=-1 for immediate reboot	2011-07-26 16:49:45 -07:00
params.c	module: add /sys/module/<name>/uevent files	2011-07-24 22:06:04 +09:30
pid.c	…
pid_namespace.c	…
pm_qos_params.c	…
posix-cpu-timers.c	…
posix-timers.c	…
printk.c	…
profile.c	…
ptrace.c	…
range.c	…
rcupdate.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
rcutiny.c	…
rcutiny_plugin.h	…
rcutorture.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
rcutree.c	…
rcutree.h	…
rcutree_plugin.h	…
rcutree_trace.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
relay.c	…
res_counter.c	…
resource.c	…
rtmutex-debug.c	…
rtmutex-debug.h	…
rtmutex-tester.c	…
rtmutex.c	…
rtmutex.h	…
rtmutex_common.h	…
rwsem.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
sched.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
sched_autogroup.c	…
sched_autogroup.h	…
sched_clock.c	…
sched_cpupri.c	…
sched_cpupri.h	…
sched_debug.c	…
sched_fair.c	…
sched_features.h	Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-07-24 09:07:03 -07:00
sched_idletask.c	…
sched_rt.c	…
sched_stats.h	…
sched_stoptask.c	…
seccomp.c	…
semaphore.c	…
signal.c	signals: sys_ssetmask/sys_rt_sigsuspend should use set_current_blocked()	2011-07-27 12:53:36 -07:00
smp.c	…
softirq.c	…
spinlock.c	…
srcu.c	…
stacktrace.c	…
stop_machine.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
sys.c	notifiers: sys: move reboot notifiers into reboot.h	2011-07-25 20:57:14 -07:00
sys_ni.c	…
sysctl.c	…
sysctl_binary.c	…
sysctl_check.c	…
taskstats.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
test_kprobes.c	…
time.c	…
timeconst.pl	…
timer.c	…
tracepoint.c	…
tsacct.c	…
uid16.c	…
up.c	…
user-return-notifier.c	…
user.c	…
user_namespace.c	…
utsname.c	…
utsname_sysctl.c	…
wait.c	…
watchdog.c	…
workqueue.c	…
workqueue_sched.h	…