summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-08 15:46:30 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-08 15:46:36 +0100
commitb5aa97e83bcc31a96374d18f5452d53909a16c90 (patch)
treeec1fe68841df5c79f7f34a8b1594d48d22e4076c /kernel
parentFix a race condition in FASYNC handling (diff)
parentx86: signal: change type of paramter for sys_rt_sigreturn() (diff)
parentx86: ret_from_fork - get rid of jump back (diff)
downloadlinux-b5aa97e83bcc31a96374d18f5452d53909a16c90.tar.xz
linux-b5aa97e83bcc31a96374d18f5452d53909a16c90.zip
Merge branches 'x86/signal' and 'x86/irq' into perfcounters/core
Merge these pending x86 tree changes into the perfcounters tree to avoid conflicts.