sugar/linux
1
0
Fork 0
Code Activity
Files
f541ae326fa120fa5c57433e4d9a133df212ce41
linux/kernel
History
Ingo Molnar f541ae326f Merge branch 'linus' into perfcounters/core-v2 
Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-04-06 09:02:57 +02:00
..
irq
Merge branch 'tracing/core-v2' into tracing-for-linus
2009-04-02 00:49:02 +02:00
power
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-04-03 15:24:35 -07:00
time
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-03-26 16:05:42 -07:00
trace
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-05 11:04:19 -07:00
.gitignore
…
acct.c
…
async.c
async: remove the temporary (2.6.29) "async is off by default" code
2009-03-28 13:05:30 -07:00
audit_tree.c
audit: incorrect ref counting in audit tree tag_chunk
2009-04-05 13:48:26 -04:00
audit.c
Audit: remove spaces from audit_log_d_path
2009-04-05 13:49:04 -04:00
audit.h
…
auditfilter.c
make the e->rule.xxx shorter in kernel auditfilter.c
2009-04-05 13:40:33 -04:00
auditsc.c
Audit: remove spaces from audit_log_d_path
2009-04-05 13:49:04 -04:00
backtracetest.c
…
bounds.c
…
capability.c
…
cgroup_debug.c
debug cgroup: remove unneeded cgroup_lock
2009-04-02 19:04:54 -07:00
cgroup_freezer.c
…
cgroup.c
memcg: fix OOM killer under memcg
2009-04-02 19:04:55 -07:00
compat.c
…
configs.c
…
cpu.c
cpumask: use set_cpu_active in init/main.c
2009-03-30 22:05:12 +10:30
cpuset.c
cpusets: prevent PF_THREAD_BOUND tasks from attaching to non-root cpusets
2009-04-02 19:04:57 -07:00
cred-internals.h
…
cred.c
…
delayacct.c
…
dma-coherent.c
…
dma.c
…
exec_domain.c
Get rid of indirect include of fs_struct.h
2009-03-31 23:00:27 -04:00
exit.c
Merge branch 'linus' into perfcounters/core-v2
2009-04-06 09:02:57 +02:00
extable.c
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-05 11:04:19 -07:00
fork.c
Merge branch 'linus' into perfcounters/core-v2
2009-04-06 09:02:57 +02:00
freezer.c
…
futex_compat.c
…
futex.c
…
hrtimer.c
…
itimer.c
…
kallsyms.c
Ksplice: Add functions for walking kallsyms symbols
2009-03-31 13:05:32 +10:30
Kconfig.freezer
…
Kconfig.hz
…
Kconfig.preempt
…
kexec.c
kexec: vmcoreinfo_data[] can become static
2009-04-02 19:05:04 -07:00
kfifo.c
…
kgdb.c
…
kmod.c
module: create a request_module_nowait()
2009-03-31 13:05:35 +10:30
kprobes.c
kprobes: Fix locking imbalance in kretprobes
2009-03-18 12:51:16 +01:00
ksysfs.c
…
kthread.c
cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL
2009-03-30 22:05:11 +10:30
latencytop.c
…
lockdep_internals.h
…
lockdep_proc.c
…
lockdep_states.h
…
lockdep.c
Merge branch 'tracing/core-v2' into tracing-for-linus
2009-04-02 00:49:02 +02:00
Makefile
Merge branch 'linus' into perfcounters/core-v2
2009-04-06 09:02:57 +02:00
marker.c
…
module.c
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-05 11:04:19 -07:00
mutex-debug.c
…
mutex-debug.h
…
mutex.c
…
mutex.h
…
notifier.c
…
ns_cgroup.c
cgroups: relax ns_can_attach checks to allow attaching to grandchild cgroups
2009-04-02 19:04:53 -07:00
nsproxy.c
…
panic.c
panic: clean up kernel/panic.c
2009-03-13 11:25:53 +01:00
params.c
param: fix charp parameters set via sysfs
2009-03-31 13:05:30 +10:30
perf_counter.c
…
pid_namespace.c
signals: zap_pid_ns_process() should use force_sig()
2009-04-02 19:04:58 -07:00
pid.c
pids: refactor vnr/nr_ns helpers to make them safe
2009-04-02 19:05:02 -07:00
pm_qos_params.c
…
posix-cpu-timers.c
posix timers: fix RLIMIT_CPU && fork()
2009-03-23 20:43:35 +01:00
posix-timers.c
…
printk.c
Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-05 10:23:25 -07:00
profile.c
…
ptrace.c
Merge branch 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-03 17:35:06 -07:00
rcuclassic.c
…
rcupdate.c
rcu: rcu_barrier VS cpu_hotplug: Ensure callbacks in dead cpu are migrated to online cpu
2009-03-31 00:09:37 +02:00
rcupreempt_trace.c
…
rcupreempt.c
…
rcutorture.c
cpumask: convert rcutorture.c
2009-03-30 22:05:16 +10:30
rcutree_trace.c
…
rcutree.c
…
relay.c
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-05 11:04:19 -07:00
res_counter.c
…
resource.c
…
rtmutex_common.h
…
rtmutex-debug.c
…
rtmutex-debug.h
…
rtmutex-tester.c
…
rtmutex.c
…
rtmutex.h
…
rwsem.c
…
sched_clock.c
Merge branch 'tracing/core-v2' into tracing-for-linus
2009-04-02 00:49:02 +02:00
sched_cpupri.c
…
sched_cpupri.h
cpumask: remove cpumask_t from core
2009-03-30 22:05:17 +10:30
sched_debug.c
sched: remove unused fields from struct rq
2009-03-24 23:16:51 +01:00
sched_fair.c
…
sched_features.h
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-03-30 17:17:35 -07:00
sched_idletask.c
…
sched_rt.c
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
2009-03-27 17:28:43 +01:00
sched_stats.h
sched: remove unused fields from struct rq
2009-03-24 23:16:51 +01:00
sched.c
Merge branch 'linus' into perfcounters/core-v2
2009-04-06 09:02:57 +02:00
seccomp.c
…
semaphore.c
…
signal.c
signals: SI_USER: Masquerade si_pid when crossing pid ns boundary
2009-04-02 19:04:58 -07:00
slow-work.c
Document the slow work thread pool
2009-04-03 16:42:35 +01:00
smp.c
…
softirq.c
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-05 11:04:19 -07:00
softlockup.c
…
spinlock.c
Allow rwlocks to re-enable interrupts
2009-04-02 19:05:11 -07:00
srcu.c
…
stacktrace.c
…
stop_machine.c
cpumask: remove cpumask_t from core
2009-03-30 22:05:17 +10:30
sys_ni.c
…
sys.c
Merge branch 'linus' into perfcounters/core-v2
2009-04-06 09:02:57 +02:00
sysctl_check.c
…
sysctl.c
Make the slow work pool configurable
2009-04-03 16:42:35 +01:00
taskstats.c
…
test_kprobes.c
…
time.c
…
timeconst.pl
…
timer.c
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-03-30 17:17:35 -07:00
tracepoint.c
tracepoints: dont update zero-sized tracepoint sections
2009-03-18 19:55:00 +01:00
tsacct.c
…
uid16.c
…
up.c
…
user_namespace.c
…
user.c
Merge branch 'master' into next
2009-03-24 10:52:46 +11:00
utsname_sysctl.c
proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers
2009-04-02 19:05:01 -07:00
utsname.c
…
wait.c
…
workqueue.c
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-05 11:04:19 -07:00