xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-next' into for-linus

Browse Source 
Conflicts:

	kernel/irq/chip.c
This commit is contained in:
Jiri Kosina
2009-12-07 18:36:35 +01:00
parent 6ec22f9b03 6070d81eb5
commit d014d04386
490 changed files with 721 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ipw2x00/libipw_module.c
View File

@@ -175,7 +175,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
ieee->host_decrypt = 1;
ieee->host_mc_decrypt = 1;
/* Host fragementation in Open mode. Default is enabled.
/* Host fragmentation in Open mode. Default is enabled.
* Note: host fragmentation is always enabled if host encryption
* is enabled. For cards can do hardware encryption, they must do
* hardware fragmentation as well. So we don't need a variable