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

This commit is contained in:
Linus Torvalds
2005-07-27 16:37:03 -07:00
3 changed files with 12 additions and 9 deletions
+3
View File
@@ -266,6 +266,9 @@
#define __NR_ioprio_set 1274
#define __NR_ioprio_get 1275
#define __NR_set_zone_reclaim 1276
#define __NR_inotify_init 1277
#define __NR_inotify_add_watch 1278
#define __NR_inotify_rm_watch 1279
#ifdef __KERNEL__