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-30 19:51:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'linus' into cpus4096-for-linus

Browse source 
Conflicts:

	net/sunrpc/svc.c

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2008-07-21 17:19:50 +02:00
commit eb6a12c242
1549 changed files with 148455 additions and 79114 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/acpi/bay.c
View file

@ -377,9 +377,6 @@ static int __init bay_init(void)
INIT_LIST_HEAD(&drive_bays);
if (acpi_disabled)
return -ENODEV;
if (acpi_disabled)
return -ENODEV;

3
drivers/acpi/dock.c
View file

@ -917,9 +917,6 @@ static int __init dock_init(void)
dock_station = NULL;
if (acpi_disabled)
return 0;
if (acpi_disabled)
return 0;

3
drivers/acpi/glue.c
View file

@ -335,9 +335,6 @@ static int __init acpi_rtc_init(void)
{
struct device *dev = get_rtc_dev();
if (acpi_disabled)
return 0;
if (acpi_disabled)
return 0;