git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Thu, 22 Sep 2011 07:23:13 +0000 (03:23 -0400)
committer	David S. Miller <davem@davemloft.net>
	Thu, 22 Sep 2011 07:23:13 +0000 (03:23 -0400)
commit	8decf868790b48a727d7e7ca164f2bcd3c1389c0
tree	b759a5f861f842af7ea76f9011b579d06e9d5508	tree \| snapshot
parent	3fc72370186be2f9d4d6ef06d99e1caa5d92c564	commit \| diff
parent	d93dc5c4478c1fd5de85a3e8aece9aad7bbae044	commit \| diff

Merge branch 'master' of github.com:davem330/net

Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c

73 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/bcma/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/aeroflex/greth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/aeroflex/greth.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/amd/am79c961a.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/freescale/gianfar_ethtool.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000/e1000_hw.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/marvell/pxa168_eth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/Kconfig	diff1 \|	\|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/efx.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/io.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/mcdi.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/nic.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/nic.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/siena.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/workarounds.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/sun/cassini.c	diff1 \|	\|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	\|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-3945-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/acx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_if.c	diff1 \|	diff2 \|	blob \| history
net/can/af_can.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/fib_rules.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/core/netpoll.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/bcma/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/aeroflex/greth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/aeroflex/greth.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/amd/am79c961a.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/freescale/gianfar_ethtool.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000/e1000_hw.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/marvell/pxa168_eth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/Kconfig	diff1 \|	\|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/efx.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/io.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/mcdi.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/nic.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/nic.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/siena.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/sfc/workarounds.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/sun/cassini.c	diff1 \|	\|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	\|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-3945-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/acx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_if.c	diff1 \|	diff2 \|	blob \| history
net/can/af_can.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/fib_rules.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/core/netpoll.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history