Merge commit 'v2.6.27-rc1' into x86/core

Conflicts:

	include/asm-x86/dma-mapping.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/lguest/boot.c
Simple merge

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

diff --cc include/asm-x86/dma-mapping.h
index 71b6f7d22e9a9d71236f3abe56c7dcb0ba1fbb8d,ad9cd6d49bfc9bc624747709da188301b35f5b55..5d200e78bd81e18b7e315f8f2d9660cd13c23a1d
--- 1/include/asm-x86/dma-mapping.h
--- 2/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@@ -212,25 -249,5 +249,5 @@@ static inline int dma_get_cache_alignme
  
  #define dma_is_consistent(d, h)       (1)
  
- #ifdef CONFIG_X86_32
- #  define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
- struct dma_coherent_mem {
-       void            *virt_base;
-       u32             device_base;
-       int             size;
-       int             flags;
-       unsigned long   *bitmap;
- };
- 
- extern int
- dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
-                           dma_addr_t device_addr, size_t size, int flags);
- 
- extern void
- dma_release_declared_memory(struct device *dev);
- 
- extern void *
- dma_mark_declared_memory_occupied(struct device *dev,
-                                 dma_addr_t device_addr, size_t size);
- #endif /* CONFIG_X86_32 */
+ #include <asm-generic/dma-coherent.h>
 -#endif
 +#endif /* ASM_X86__DMA_MAPPING_H */

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

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

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

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

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

diff --cc include/asm-x86/uaccess.h
index 1838f3959a5ef9f1a94ae851c1576ced6d5ed45e,5f702d1d52184424941d3238ee82597c9f05ce37..48ebc0ad40ec17b66b700812c5c4792662227a8f
--- 1/include/asm-x86/uaccess.h
--- 2/include/asm-x86/uaccess.h
+++ b/include/asm-x86/uaccess.h
@@@ -450,4 -450,5 +450,5 @@@ extern struct movsl_mask 
  # include "uaccess_64.h"
  #endif
  
 -#endif
 +#endif /* ASM_X86__UACCESS_H */
+ 

diff --cc kernel/irq/manage.c
Simple merge