[stable] [PATCH 2/2] iwlwifi: unify iwl_setup_rxon_timing

[Greg KH]

On Tue, Dec 15, 2009 at 11:45:10AM +0800, Ike Panhc wrote:
> This patch unifies setup_rxon_timing funcions
> of AGN and 3945. HWs differ only in supported maximal
> beacon interval. This is reflected in hw_paras.max_beacon_itrvl
> 
> Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
> Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
> Signed-off-by: John W. Linville <linville at tuxdriver.com>
> (cherry picked from commit 2c2f3b33888419fb9e7d015b9dc67b9db4437efa)
> 
> Conflicts:
> 
> 	drivers/net/wireless/iwlwifi/iwl-dev.h

What does this mean?

> CC: stable at kernel.org
> Signed-off-by: Ike Panhc <ike.pan at canonical.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/496496

What are you expecting this patch to be applied to?

confused,

greg k-h