Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --cc include/asm-arm/bug.h
index 0e36fd5,5ab8216..7fb0213
--- 1/include/asm-arm/bug.h
--- 2/include/asm-arm/bug.h
+++ b/include/asm-arm/bug.h
@@@ -1,6 -1,8 +1,7 @@@
  #ifndef _ASMARM_BUG_H
  #define _ASMARM_BUG_H
  
 -#include <linux/stddef.h>
+ #include <linux/config.h>
  
  #ifdef CONFIG_BUG
  #ifdef CONFIG_DEBUG_BUGVERBOSE

diff --cc include/asm-arm/unistd.h
Simple merge

diff --cc include/asm-powerpc/spu.h
Simple merge

diff --cc include/asm-powerpc/topology.h
index 4cf340c,87362a0..19c575f
--- 1/include/asm-powerpc/topology.h
--- 2/include/asm-powerpc/topology.h
+++ b/include/asm-powerpc/topology.h
@@@ -2,7 -2,11 +2,10 @@@
  #define _ASM_POWERPC_TOPOLOGY_H
  #ifdef __KERNEL__
  
 -#include <linux/config.h>
  
+ struct sys_device;
+ struct device_node;
+ 
  #ifdef CONFIG_NUMA
  
  #include <asm/mmzone.h>

diff --cc include/asm-ppc/commproc.h
Simple merge

diff --cc include/asm-sparc/unistd.h
Simple merge

diff --cc include/asm-sparc64/tlbflush.h
Simple merge

diff --cc include/asm-sparc64/unistd.h
Simple merge

diff --cc include/linux/audit.h
Simple merge

diff --cc include/net/ax25.h
Simple merge

diff --cc include/net/inet_timewait_sock.h
Simple merge

diff --cc include/net/sock.h
Simple merge