xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c
This commit is contained in:
David S. Miller
2009-03-05 02:06:47 -08:00
parent 2c3c3d02f2 72e2240f18
commit 508827ff0a
120 changed files with 1047 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/mips/include/asm/seccomp.h
View File

@@ -1,6 +1,5 @@
#ifndef __ASM_SECCOMP_H
#include <linux/thread_info.h>
#include <linux/unistd.h>
#define __NR_seccomp_read __NR_read