TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin'

Browse Source 
Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h
This commit is contained in:
Benjamin Herrenschmidt
2008-10-15 11:31:54 +11:00
parent ee673eaa72 8acd3a60bc
commit 6dc6472581
5097 changed files with 278765 additions and 138501 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/powerpc/platforms/cell/spufs/inode.c
+1 -1
View File
@@ -661,7 +661,7 @@ enum {
Opt_uid, Opt_gid, Opt_mode, Opt_debug, Opt_err,
};
static match_table_t spufs_tokens = {
static const match_table_t spufs_tokens = {
{ Opt_uid, "uid=%d" },
{ Opt_gid, "gid=%d" },
{ Opt_mode, "mode=%o" },