A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-next' into for-linus

Browse source 
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
This commit is contained in:
Jiri Kosina 2010-03-08 16:55:37 +01:00
commit 318ae2edc3
246 changed files with 396 additions and 3454 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/w1/w1.c
View file

@ -986,7 +986,7 @@ int w1_process(void *data)
return 0;
}
static int w1_init(void)
static int __init w1_init(void)
{
int retval;
@ -1034,7 +1034,7 @@ err_out_exit_init:
return retval;
}
static void w1_fini(void)
static void __exit w1_fini(void)
{
struct w1_master *dev;