lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests 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

2
drivers/pnp/pnpbios/core.c
View File

@@ -571,7 +571,7 @@ static int __init pnpbios_init(void)
return 0;
}
subsys_initcall(pnpbios_init);
fs_initcall(pnpbios_init);
static int __init pnpbios_thread_init(void)
{