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	perf: Remove perf_event_attr::type check	2011-07-21 20:41:55 +02:00
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	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-07-22 16:52:18 -07:00
trace	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
.gitignore	…
Kconfig.freezer	…
Kconfig.hz	…
Kconfig.locks	…
Kconfig.preempt	sched: Isolate preempt counting in its own config option	2011-06-10 15:15:40 +02:00
Makefile	kernel: prevent unnecessary rebuilding due to config_data.gz	2011-07-20 01:32:32 +02:00
acct.c	…
async.c	async: Fixed an include coding style issue	2011-06-14 22:48:46 -04:00
audit.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
audit.h	…
audit_tree.c	audit_tree,rcu: Convert call_rcu(__put_tree) to kfree_rcu()	2011-07-20 14:10:11 -07:00
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	cgroups: add per-thread subsystem callbacks	2011-05-26 17:12:34 -07:00
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	Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs	2011-05-27 10:25:02 -07:00
delayacct.c	KVM: Steal time implementation	2011-07-14 12:59:14 +03:00
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	hrtimers: Fix typo causing erratic timers	2011-05-25 15:31:58 -07:00
hung_task.c	…
irq_work.c	…
itimer.c	…
jump_label.c	jump_label: Fix jump_label update for modules	2011-06-29 09:59:17 -04:00
kallsyms.c	…
kexec.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
kfifo.c	…
kmod.c	KEYS/DNS: Fix ____call_usermodehelper() to not lose the session keyring	2011-06-17 09:40:48 -07:00
kprobes.c	kprobes: Return -ENOENT if probe point doesn't exist	2011-07-15 15:11:47 -04:00
ksysfs.c	…
kthread.c	cpuset: Fix cpuset_cpus_allowed_fallback(), don't update tsk->rt.nr_cpus_allowed	2011-05-28 17:02:57 +02:00
latencytop.c	…
lockdep.c	Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-07-22 16:43:49 -07:00
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	lockdep, mutex: provide mutex_lock_nest_lock	2011-05-25 08:39:17 -07:00
mutex.h	…
notifier.c	notifiers: sys: move reboot notifiers into reboot.h	2011-07-25 20:57:14 -07:00
nsproxy.c	make sure that nsproxy_cache is initialized early enough	2011-07-20 01:44:07 -04:00
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	rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check	2011-07-08 22:21:58 +02:00
pid_namespace.c	…
pm_qos_params.c	plist: Remove the need to supply locks to plist heads	2011-07-08 14:02:53 +02:00
posix-cpu-timers.c	…
posix-timers.c	posix-timers: RCU conversion	2011-05-24 12:10:51 +02:00
printk.c	printk: Fix console_sem vs logbuf_lock unlock race	2011-06-22 11:39:34 +02:00
profile.c	kernel/profile.c: remove some duplicate code from profile_hits()	2011-05-26 17:12:37 -07:00
ptrace.c	connector: add an event for monitoring process tracers	2011-07-18 21:38:33 +02:00
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	rcu: Prevent RCU callbacks from executing before scheduler initialized	2011-07-13 08:17:56 -07:00
rcutree.h	rcu: Move RCU_BOOST #ifdefs to header file	2011-06-16 16:12:05 -07:00
rcutree_plugin.h	softirq,rcu: Inform RCU of irq_exit() activity	2011-07-20 10:50:12 -07:00
rcutree_trace.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
relay.c	…
res_counter.c	…
resource.c	resource: ability to resize an allocated resource	2011-07-06 10:54:08 -07:00
rtmutex-debug.c	…
rtmutex-debug.h	…
rtmutex-tester.c	…
rtmutex.c	plist: Remove the need to supply locks to plist heads	2011-07-08 14:02:53 +02:00
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: Skip autogroup when looking for all rt sched groups	2011-07-01 10:39:08 +02:00
sched_clock.c	…
sched_cpupri.c	…
sched_cpupri.h	…
sched_debug.c	…
sched_fair.c	sched: Cleanup duplicate local variable in [enqueue|dequeue]_task_fair	2011-07-22 12:47:22 +02:00
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: Skip autogroup when looking for all rt sched groups	2011-07-01 10:39:08 +02:00
sched_stats.h	sched: More sched_domain iterations fixes	2011-05-28 17:02:54 +02:00
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	generic-ipi: Fix kexec boot crash by initializing call_single_queue before enabling interrupts	2011-06-17 10:17:12 +02:00
softirq.c	softirq,rcu: Inform RCU of irq_exit() activity	2011-07-20 10:50:12 -07:00
spinlock.c	…
srcu.c	…
stacktrace.c	stack_trace: Add weak save_stack_trace_regs()	2011-06-14 22:48:52 -04:00
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,rcu: Convert call_rcu(free_head) to kfree	2011-07-20 14:10:18 -07:00
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	timers: Consider slack value in mod_timer()	2011-06-03 15:02:32 +02:00
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	perf, x86: P4 PMU - Introduce event alias feature	2011-07-14 17:25:04 -04:00
workqueue.c	Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-07-22 15:07:15 -07:00
workqueue_sched.h	…