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

This commit is contained in:
David Woodhouse
2006-04-29 01:42:26 +01:00
committed by David Woodhouse
202 changed files with 4049 additions and 2574 deletions

View File

@@ -303,8 +303,9 @@
#define __NR_unshare 282
#define __NR_splice 283
#define __NR_tee 284
#define __NR_vmsplice 285
#define __NR_syscalls 285
#define __NR_syscalls 286
#ifdef __KERNEL__
#define __NR__exit __NR_exit