Merge branch 'linus' into x86/header-guards

Conflicts:

	include/asm-x86/gpio.h
	include/asm-x86/ide.h

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

diff --cc arch/x86/boot/compressed/misc.c
Simple merge

diff --cc include/asm-x86/gpio.h
index f269ff9cd40b5a0273146c985c1e34a3a2d21ee9,116e9147fe66473c0412685480e565a8a1fd8b76..f9e8f8918a9dfa0750d2a289c0be5ecc30a3047f
--- 1/include/asm-x86/gpio.h
--- 2/include/asm-x86/gpio.h
+++ b/include/asm-x86/gpio.h
@@@ -1,6 -1,62 +1,62 @@@
- #ifndef ASM_X86__GPIO_H
- #define ASM_X86__GPIO_H
+ /*
+  * Generic GPIO API implementation for x86.
+  *
+  * Derived from the generic GPIO API for powerpc:
+  *
+  * Copyright (c) 2007-2008  MontaVista Software, Inc.
+  *
+  * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  */
  
+ #ifndef _ASM_I386_GPIO_H
+ #define _ASM_I386_GPIO_H
+ 
+ #ifdef CONFIG_X86_RDC321X
  #include <gpio.h>
+ #else /* CONFIG_X86_RDC321X */
+ 
+ #include <asm-generic/gpio.h>
+ 
+ #ifdef CONFIG_GPIOLIB
+ 
+ /*
+  * Just call gpiolib.
+  */
+ static inline int gpio_get_value(unsigned int gpio)
+ {
+       return __gpio_get_value(gpio);
+ }
+ 
+ static inline void gpio_set_value(unsigned int gpio, int value)
+ {
+       __gpio_set_value(gpio, value);
+ }
+ 
+ static inline int gpio_cansleep(unsigned int gpio)
+ {
+       return __gpio_cansleep(gpio);
+ }
+ 
+ /*
+  * Not implemented, yet.
+  */
+ static inline int gpio_to_irq(unsigned int gpio)
+ {
+       return -ENOSYS;
+ }
+ 
+ static inline int irq_to_gpio(unsigned int irq)
+ {
+       return -EINVAL;
+ }
+ 
+ #endif /* CONFIG_GPIOLIB */
+ 
+ #endif /* CONFIG_X86_RDC321X */
  
 -#endif /* _ASM_I386_GPIO_H */
 +#endif /* ASM_X86__GPIO_H */

diff --cc include/asm-x86/hugetlb.h
Simple merge

diff --cc include/asm-x86/i387.h
Simple merge

diff --cc include/asm-x86/io_32.h
Simple merge

diff --cc include/asm-x86/io_64.h
Simple merge

diff --cc include/asm-x86/ipi.h
Simple merge

diff --cc include/asm-x86/page.h
Simple merge

diff --cc include/asm-x86/paravirt.h
Simple merge

diff --cc include/asm-x86/pgtable-3level.h
Simple merge

diff --cc include/asm-x86/pgtable.h
Simple merge

diff --cc include/asm-x86/pgtable_32.h
Simple merge

diff --cc include/asm-x86/pgtable_64.h
Simple merge

diff --cc include/asm-x86/processor-flags.h
index ae1d434f1972f3d7ee20b2ff97e982c426d43f88,eff2ecd7fff067caf89bc48cd81bebe111a43363..5dd79774f693c176d66e8e2d5ef7639d85569c25
--- 1/include/asm-x86/processor-flags.h
--- 2/include/asm-x86/processor-flags.h
+++ b/include/asm-x86/processor-flags.h
@@@ -93,5 -94,6 +94,6 @@@
  #else
  #define X86_VM_MASK   0 /* No VM86 support */
  #endif
+ #endif
  
 -#endif        /* __ASM_I386_PROCESSOR_FLAGS_H */
 +#endif /* ASM_X86__PROCESSOR_FLAGS_H */

diff --cc include/asm-x86/processor.h
Simple merge

diff --cc include/asm-x86/thread_info.h
Simple merge

diff --cc include/asm-x86/unistd_32.h
Simple merge

diff --cc include/asm-x86/unistd_64.h
Simple merge

diff --cc include/asm-x86/xen/page.h
Simple merge