From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 4 Jan 2011 08:43:42 +0000 (+0100)
Subject: Merge commit 'v2.6.37-rc8' into x86/apic
X-Git-Tag: v2.6.38-rc1~486^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=bc030d6cb9532877c1c5a3f5e7123344fa24a285

Merge commit 'v2.6.37-rc8' into x86/apic

Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: move to a fresh -rc, resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

bc030d6cb9532877c1c5a3f5e7123344fa24a285
diff --cc arch/x86/include/asm/io_apic.h
index d7d46cb53e52,a6b28d017c2f..0c5ca4e30d7b
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@@ -168,8 -168,10 +168,9 @@@ extern int save_IO_APIC_setup(struct IO
  extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
  extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
  
 -extern void probe_nr_irqs_gsi(void);
+ extern int get_nr_irqs_gsi(void);
 -
  extern void setup_ioapic_ids_from_mpc(void);
 +extern void setup_ioapic_ids_from_mpc_nocheck(void);
  
  struct mp_ioapic_gsi{
  	u32 gsi_base;