Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Sat, 14 Aug 2010 04:23:57 +0000 (21:23 -0700)]
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Add latest crop of syscalls
  [IA64] Fix 64-bit atomic routines to return "long"

1  2 
arch/ia64/include/asm/unistd.h

Simple merge