]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Sep 2011 02:24:08 +0000 (12:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Sep 2011 02:24:08 +0000 (12:24 +1000)
commitf21825f4b585cefa695aa0c309ba9454bcf482fb
treeac03e0a95f1ee7cb8a32bdc5360d67b8b35873ab
parent7926067423c6321639714dfacc7173684fd95d47
parentab7e11d9d0293ef1802d6ae8aab39ce58472b167
Merge remote-tracking branch 'net/master'

Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
37 files changed:
MAINTAINERS
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/powerpc/configs/ppc40x_defconfig
arch/powerpc/platforms/40x/Kconfig
arch/s390/include/asm/qdio.h
drivers/bcma/main.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/net/cris/eth_v10.c
drivers/net/ethernet/amd/am79c961a.c
drivers/net/ethernet/cadence/at91_ether.c
drivers/net/ethernet/ibm/ibmveth.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/sun/cassini.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/carl9170/main.c
drivers/net/wireless/iwlegacy/iwl-3945-rs.c
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
drivers/net/wireless/wl12xx/main.c
drivers/s390/cio/qdio_main.c
drivers/s390/cio/qdio_setup.c
drivers/s390/net/lcs.c
drivers/scsi/bnx2fc/bnx2fc.h
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
drivers/scsi/fcoe/fcoe.c
drivers/scsi/fcoe/fcoe_transport.c
include/net/cfg80211.h
net/core/neighbour.c
net/core/netpoll.c
net/ipv4/igmp.c
net/ipv6/raw.c
net/ipv6/udp.c
net/mac80211/main.c
net/mac80211/sta_info.c
net/socket.c