Merge commit 'v2.6.29-rc2' into perfcounters/core

Conflicts:
	include/linux/syscalls.h
This commit is contained in:
Ingo Molnar
2009-01-21 16:37:27 +01:00
524 changed files with 7980 additions and 3545 deletions

View File

@@ -88,7 +88,7 @@ ENTRY(sys_call_table)
.long sys_uselib
.long sys_swapon
.long sys_reboot
.long old_readdir
.long sys_old_readdir
.long old_mmap /* 90 */
.long sys_munmap
.long sys_truncate