Merge branch 'linus' into locking-for-linus

Conflicts:
	lib/Kconfig.debug
This commit is contained in:
Ingo Molnar 2009-03-31 13:53:43 +02:00
commit 7bee946358
5760 changed files with 448567 additions and 227761 deletions

View file

@ -796,6 +796,11 @@ int __init __weak early_irq_init(void)
return 0;
}
int __init __weak arch_probe_nr_irqs(void)
{
return 0;
}
int __init __weak arch_early_irq_init(void)
{
return 0;