Merge branch 'merge'

This commit is contained in:
Paul Mackerras 2006-06-01 19:05:23 +10:00
commit c029cc66cb
307 changed files with 4739 additions and 2455 deletions

View file

@ -153,6 +153,7 @@ struct termios {
#define HUPCL 00040000
#define CLOCAL 00100000
#define CMSPAR 010000000000 /* mark or space (stick) parity */
#define CRTSCTS 020000000000 /* flow control */
/* c_lflag bits */

View file

@ -321,8 +321,10 @@
#define __NR_readlinkat 296
#define __NR_fchmodat 297
#define __NR_faccessat 298
#define __NR_get_robust_list 299
#define __NR_set_robust_list 300
#define __NR_syscalls 299
#define __NR_syscalls 301
#ifdef __KERNEL__
#define __NR__exit __NR_exit