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 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge ../linux-2.6/

Browse source 
Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid

Signed-off-by: James Bottomley <[email protected]>
This commit is contained in:
James Bottomley 2006-06-28 14:06:39 -04:00
commit f28e71617d
1119 changed files with 51158 additions and 19353 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/message/fusion/mptfc.c
View file

@ -305,10 +305,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,
}
out:
if (pp0_array)
kfree(pp0_array);
if (p0_array)
kfree(p0_array);
kfree(pp0_array);
kfree(p0_array);
return rc;
}

1
drivers/message/i2o/iop.c
View file

@ -1239,7 +1239,6 @@ EXPORT_SYMBOL(i2o_cntxt_list_remove);
EXPORT_SYMBOL(i2o_cntxt_list_get_ptr);
#endif
EXPORT_SYMBOL(i2o_msg_get_wait);
EXPORT_SYMBOL(i2o_msg_nop);
EXPORT_SYMBOL(i2o_find_iop);
EXPORT_SYMBOL(i2o_iop_find_device);
EXPORT_SYMBOL(i2o_event_register);