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

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

diff --cc include/asm-ia64/machvec.h
Simple merge

diff --cc include/asm-ia64/sn/sn_sal.h
Simple merge

diff --cc include/asm-ia64/unistd.h
index 395e6b2,7107763..632f2ee
--- 1/include/asm-ia64/unistd.h
--- 2/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@@ -293,8 -294,9 +294,8 @@@
  
  #ifdef __KERNEL__
  
 -#include <linux/config.h>
  
- #define NR_syscalls                   278 /* length of syscall table */
+ #define NR_syscalls                   279 /* length of syscall table */
  
  #define __ARCH_WANT_SYS_RT_SIGACTION
  

diff --cc include/asm-mips/bitops.h
Simple merge

diff --cc include/asm-mips/mips-boards/generic.h
Simple merge

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

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

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

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