Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

author David S. Miller <davem@sunset.davemloft.net>

Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)

committer David S. Miller <davem@sunset.davemloft.net>

Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)
author David S. Miller <davem@sunset.davemloft.net>
Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)
committer David S. Miller <davem@sunset.davemloft.net>
Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)
diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/iwl4965-base.c
Simple merge
diff --cc net/mac80211/ieee80211_i.h
Simple merge
diff --cc net/mac80211/ieee80211_sta.c
Simple merge
author	David S. Miller <davem@sunset.davemloft.net>
	Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)
committer	David S. Miller <davem@sunset.davemloft.net>
	Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)
		1	2
drivers/net/wireless/iwlwifi/iwl3945-base.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl4965-base.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_sta.c	patch \|	diff1 \|	diff2 \|	blob \| history