Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
David S. Miller [Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)]
1  2 
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c
net/mac80211/ieee80211_i.h
net/mac80211/ieee80211_sta.c

Simple merge
Simple merge