summaryrefslogtreecommitdiffstats
path: root/init
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 /init
parent218d11a8b071b23b76c484fd5f72a4fe3306801e (diff)
parent4217458dafaa57d8e26a46f5d05ab8c53cf64191 (diff)
parent5b3eec0c80038c8739ccd465b897a35c0dff1cc4 (diff)
downloadlinux-stable-b5aa97e83bcc31a96374d18f5452d53909a16c90.tar.gz
linux-stable-b5aa97e83bcc31a96374d18f5452d53909a16c90.tar.bz2
linux-stable-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.