Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ba15259 authored Dec 09, 2009 by Linus Torvalds

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

parents 3a43aaa3 27a338a6

arch/ia64/include/asm/unistd.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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__