From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Sat, 29 Apr 2006 00:42:26 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.18-rc1~1103^2~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d6754b401a15eaa16492ea5dbaa4826361d3f411;p=linux-2.6-omap-h63xx.git

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

d6754b401a15eaa16492ea5dbaa4826361d3f411
diff --cc include/asm-ia64/unistd.h
index 395e6b2998f,7107763168b..632f2eedf72
--- a/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