Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix cut/paste detritus from unistd.h
This commit is contained in:
Linus Torvalds 2009-12-09 19:03:49 -08:00
commit 4ba152596d

View file

@ -311,7 +311,7 @@
#define __NR_preadv 1319
#define __NR_pwritev 1320
#define __NR_rt_tgsigqueueinfo 1321
#define __NR_rt_recvmmsg 1322
#define __NR_recvmmsg 1322
#ifdef __KERNEL__