]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 May 2008 07:34:44 +0000 (00:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 May 2008 07:34:44 +0000 (00:34 -0700)
commit63fe46da9c380b3f2bbdf3765044649517cc717c
tree9478c1aca1d692b408955aea20c9cd9a37e589c0
parent99dd1a2b8347ac2ae802300b7862f6f7bcf17139
parent066b2118976e6e7cc50eed39e2747c75343a23c4
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
18 files changed:
drivers/net/dm9000.c
drivers/net/gianfar.c
drivers/net/niu.h
drivers/net/pcnet32.c
drivers/net/ucc_geth_ethtool.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/net/wireless/rt2x00/rt61pci.c
net/mac80211/iface.c
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/wme.c
net/tipc/core.h