]> err.no Git - linux-2.6/commit
Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)
commitd06fc1d9b5518582f4982f908e820f2303d1eece
tree969d1ccf3cc47e8fe1c2154f75502cf9b67e9402
parent99fee6d7e5748d96884667a4628118f7fc130ea0
parent66fbb541a5d2d58fdae21c1e7b558a75bfbd483f
Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c
net/mac80211/ieee80211_i.h
net/mac80211/ieee80211_sta.c