diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-08 15:46:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-08 15:46:36 +0100 |
| commit | b5aa97e83bcc31a96374d18f5452d53909a16c90 (patch) | |
| tree | ec1fe68841df5c79f7f34a8b1594d48d22e4076c /init/Makefile | |
| parent | 218d11a8b071b23b76c484fd5f72a4fe3306801e (diff) | |
| parent | 4217458dafaa57d8e26a46f5d05ab8c53cf64191 (diff) | |
| parent | 5b3eec0c80038c8739ccd465b897a35c0dff1cc4 (diff) | |
Merge branches 'x86/signal' and 'x86/irq' into perfcounters/core
Merge these pending x86 tree changes into the perfcounters tree
to avoid conflicts.