]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2008 23:59:05 +0000 (16:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2008 23:59:05 +0000 (16:59 -0700)
commit332ccccf2844b1d90d98a8e88748125f91c6a036
tree88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446
parentd66e24a36251b9a4ce37d76a951be2cf9ab75cfd
parent93b08b949d37c312947ca3301c342c672bbbbbee
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

net/mac80211/mlme.c
20 files changed:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/wireless/ath9k/hw.c
drivers/net/wireless/ath9k/main.c
drivers/net/wireless/ath9k/recv.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/orinoco.c
drivers/net/wireless/rt2x00/rt2x00reg.h
net/bridge/br_ioctl.c
net/core/dev.c
net/ipv4/tcp_ipv4.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c