git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Sep 2011 03:09:59 +0000 (13:09 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Sep 2011 03:09:59 +0000 (13:09 +1000)
commit	aca4274641df3d4f3d9e76ee76b55baf6f42bbdc
tree	e34f1dbeaa216213bc9681a71d3a8dd8d7b118c4	tree \| snapshot
parent	497715a0aeb68cde625964eb520e86c8693e3c07	commit \| diff
parent	ab7e11d9d0293ef1802d6ae8aab39ce58472b167	commit \| diff

Merge remote-tracking branch 'net/master'

Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig

33 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/ppc40x_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/qdio.h	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/cris/eth_v10.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sun/cassini.c	diff1 \|	diff2 \|	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/iwlegacy/iwl-3945-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/cio/qdio_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/cio/qdio_setup.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bnx2fc/bnx2fc.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bnx2fc/bnx2fc_fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe_transport.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/core/netpoll.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/ppc40x_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/qdio.h	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/cris/eth_v10.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sun/cassini.c	diff1 \|	diff2 \|	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/iwlegacy/iwl-3945-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/cio/qdio_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/cio/qdio_setup.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bnx2fc/bnx2fc.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bnx2fc/bnx2fc_fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe_transport.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/core/netpoll.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history