Merge branch 'x86/urgent' into x86/core

Conflicts:

	include/asm-x86/gpio.h

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc include/asm-x86/gpio.h
index f9e8f8918a9dfa0750d2a289c0be5ecc30a3047f,c4c91b37c104810433f074c396ca3bbc0e69c701..497fb980d96245c72689ee3bd0eb630cf0c729a7
--- 1/include/asm-x86/gpio.h
--- 2/include/asm-x86/gpio.h
+++ b/include/asm-x86/gpio.h
@@@ -57,6 -53,4 +53,4 @@@ static inline int irq_to_gpio(unsigned 
  
  #endif /* CONFIG_GPIOLIB */
  
- #endif /* CONFIG_X86_RDC321X */
- 
 -#endif /* _ASM_I386_GPIO_H */
 +#endif /* ASM_X86__GPIO_H */

diff --cc include/asm-x86/mach-summit/mach_apic.h
Simple merge