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
commit 77835492ed
524 changed files with 7963 additions and 3528 deletions

View file

@ -100,7 +100,7 @@ static inline void put_binfmt(struct linux_binfmt * fmt)
*
* Also note that we take the address to load from from the file itself.
*/
asmlinkage long sys_uselib(const char __user * library)
SYSCALL_DEFINE1(uselib, const char __user *, library)
{
struct file *file;
struct nameidata nd;