a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
android_kernel_samsung_univ.../drivers/net/ethernet
History
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
3com
net: typhoon: remove unnecessary pci_set_drvdata()
2013-10-18 00:03:28 -04:00
8390
net: 8390: remove unnecessary pci_set_drvdata()
2013-10-18 00:03:28 -04:00
adaptec
net: starfire: remove unnecessary pci_set_drvdata()
2013-10-18 00:03:28 -04:00
adi
adi: Remove extern from function prototypes
2013-09-24 10:09:18 -04:00
aeroflex
drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent
2013-08-29 21:55:23 -04:00
allwinner
…
alteon
…
amd
net: amd8111e: remove unnecessary pci_set_drvdata()
2013-10-18 00:03:29 -04:00
apple
net:drivers/net: Miscellaneous conversions to ETH_ALEN
2013-10-02 17:04:45 -04:00
arc
ethernet/arc/arc_emac: Fix huge delays in large file copies
2013-09-05 14:25:10 -04:00
atheros
net: alx: remove unnecessary pci_set_drvdata()
2013-10-18 00:03:29 -04:00
broadcom
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
brocade
net: bna: remove unnecessary pci_set_drvdata()
2013-10-18 00:03:30 -04:00
cadence
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
calxeda
net: calxedaxgmac: determine number of address filters at runtime
2013-10-02 16:10:29 -04:00
chelsio
net: cxgb4vf: use DEFINE_PCI_DEVICE_TABLE
2013-10-22 02:19:23 -04:00
cirrus
net: ep93xx_eth: use dev_get_platdata()
2013-08-30 17:43:35 -04:00
cisco
net: enic: remove unnecessary pci_set_drvdata()
2013-10-18 00:03:30 -04:00
davicom
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
dec
net: tulip: use DEFINE_PCI_DEVICE_TABLE
2013-10-22 02:19:23 -04:00
dlink
net: dl2k: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:00 -04:00
emulex
net: be2net: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:00 -04:00
faraday
drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent
2013-08-29 21:55:23 -04:00
freescale
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
fujitsu
net: fujitsu: Remove ISA depdendency from Kconfig
2013-10-07 15:52:54 -04:00
hp
hp100: replace hardcoded name in /proc/interrupts with interface name
2013-09-27 17:38:32 -04:00
i825xx
net:drivers/net: Miscellaneous conversions to ETH_ALEN
2013-10-02 17:04:45 -04:00
ibm
net:drivers/net: Miscellaneous conversions to ETH_ALEN
2013-10-02 17:04:45 -04:00
icplus
net: icplus: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:01 -04:00
intel
i40e: Bump version
2013-10-22 06:49:46 -07:00
marvell
net: sky2: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:01 -04:00
mellanox
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
micrel
net: ksz884x: use DEFINE_PCI_DEVICE_TABLE
2013-10-22 02:19:23 -04:00
microchip
…
moxa
ethernet: moxa: remove duplicate includes
2013-10-21 18:46:45 -04:00
myricom
net: myri10ge: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:02 -04:00
natsemi
net: natsemi: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:02 -04:00
neterion
net: neterion: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:02 -04:00
nuvoton
drivers:net: delete premature free_irq
2013-09-04 13:18:19 -04:00
nvidia
…
nxp
…
octeon
…
oki-semi
oki-semi: Remove extern from function prototypes
2013-09-24 12:51:46 -07:00
packetengines
net: packetengines: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:02 -04:00
pasemi
net: pasemi: remove unnecessary pci_set_drvdata()
2013-10-22 02:11:51 -04:00
qlogic
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
rdc
net: r6040: remove unnecessary pci_set_drvdata()
2013-10-22 02:11:52 -04:00
realtek
net: r8169: remove unnecessary pci_set_drvdata()
2013-10-22 02:11:52 -04:00
renesas
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
seeq
net: seeq: use dev_get_platdata()
2013-08-30 17:43:37 -04:00
sfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-08 23:07:53 -04:00
sgi
net:drivers/net: Miscellaneous conversions to ETH_ALEN
2013-10-02 17:04:45 -04:00
silan
…
sis
net: sis190: remove unnecessary pci_set_drvdata()
2013-10-22 02:11:52 -04:00
smsc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
stmicro
net: stmmac: remove unnecessary pci_set_drvdata()
2013-10-22 02:11:53 -04:00
sun
net: cassini: remove unnecessary pci_set_drvdata()
2013-10-22 02:11:53 -04:00
tehuti
…
ti
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
tile
net:drivers/net: Miscellaneous conversions to ETH_ALEN
2013-10-02 17:04:45 -04:00
toshiba
toshiba: Remove extern from function prototypes
2013-09-24 12:54:12 -07:00
tundra
net: tsi108: use dev_get_platdata()
2013-08-30 17:43:38 -04:00
via
via-rhine: fix VLAN priority field (PCP, IEEE 802.1p)
2013-09-26 16:09:00 -04:00
wiznet
net: w5100: use dev_get_platdata()
2013-08-30 17:43:38 -04:00
xilinx
net:drivers/net: Miscellaneous conversions to ETH_ALEN
2013-10-02 17:04:45 -04:00
xircom
…
xscale
net: ixp4xx_eth: use dev_get_platdata()
2013-08-30 17:43:39 -04:00
dnet.c
…
dnet.h
…
ethoc.c
net: ethoc: use dev_get_platdata()
2013-08-30 17:43:35 -04:00
fealnx.c
net: fealnx: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:01 -04:00
jme.c
net: jme: remove unnecessary pci_set_drvdata()
2013-10-21 17:21:01 -04:00
jme.h
…
Kconfig
…
korina.c
net:drivers/net: Miscellaneous conversions to ETH_ALEN
2013-10-02 17:04:45 -04:00
lantiq_etop.c
net: lantiq_etop: remove deprecated IRQF_DISABLED
2013-09-15 22:01:05 -04:00
Makefile
…
netx-eth.c
net: netx-eth: remove unnecessary casting
2013-09-04 00:27:27 -04:00
s6gmac.c
…