openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/Documentation/devicetree/bindings/net
History
David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/usb/qmi_wwan.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
	include/net/netfilter/nf_conntrack_synproxy.h
	include/net/secure_seq.h

The conflicts are of two varieties:

1) Conflicts with Joe Perches's 'extern' removal from header file
   function declarations.  Usually it's an argument signature change
   or a function being added/removed.  The resolutions are trivial.

2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
   a new value, another changes an existing value.  That sort of
   thing.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2013-10-01 17:06:14 -04:00
..
can Device tree core updates for v3.12 2013-09-10 13:53:52 -07:00
dsa dsa: fix device tree binding documentation typo on #address-cells 2013-03-25 12:23:41 -04:00
allwinner,sun4i-emac.txt net: Add EMAC ethernet driver found on Allwinner A10 SoC's 2013-05-31 17:23:07 -07:00
allwinner,sun4i-mdio.txt net: Add MDIO bus driver for the Allwinner EMAC 2013-05-31 17:23:07 -07:00
arc_emac.txt ethernet/arc/arc_emac - Add new driver 2013-06-25 16:34:32 -07:00
broadcom-bcm87xx.txt netdev/phy: Add driver for Broadcom BCM87XX 10G Ethernet PHYs 2012-06-27 21:23:25 -07:00
calxeda-xgmac.txt ARM: highbank: add coherent DMA setup 2012-10-02 08:58:07 +02:00
cavium-mdio.txt MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
cavium-mix.txt MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
cavium-pip.txt MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
cdns-emac.txt net: at91_ether: add dt support 2012-11-06 17:41:42 -05:00
cpsw-phy-sel.txt drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw 2013-09-24 10:33:07 -04:00
cpsw.txt drivers: net: ethernet: cpsw: add phy-mode support to cpsw driver 2013-06-04 14:17:22 -07:00
davicom-dm9000.txt net: dm9000: Allow instantiation using device tree 2013-05-20 14:03:51 -07:00
davinci-mdio.txt drivers: net: ethernet: davince_mdio: device tree implementation 2012-08-07 16:24:55 -07:00
davinci_emac.txt net: ethernet: davinci_emac: add OF support 2012-07-18 09:40:54 -07:00
fsl-fec.txt Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-19 11:17:30 -07:00
fsl-tsec-phy.txt powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file 2013-09-30 21:17:16 -07:00
gpmc-eth.txt Documentation: dt: update TI GPMC ethernet binding properties 2013-04-30 08:33:59 -05:00
lpc-eth.txt net: Add device tree support to LPC32xx 2012-04-22 12:01:19 +02:00
macb.txt ARM: at91/trivial: typo in GEM compatible string 2013-05-14 15:33:35 +02:00
marvell-armada-370-neta.txt net: mvneta: add clk support 2012-11-20 23:14:25 +01:00
marvell-orion-mdio.txt net: mvmdio: add clocks property to binding documentation 2013-04-11 16:19:37 -04:00
marvell-orion-net.txt net: mv643xx_eth: add DT parsing support 2013-05-30 17:54:04 -07:00
mdio-gpio.txt of/net/mdio-gpio: Fix pdev->id issue when using devicetrees. 2012-11-19 18:57:07 -05:00
mdio-mux-gpio.txt netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines. 2012-05-07 22:58:09 -04:00
mdio-mux-mmioreg.txt netdev/phy: add MDIO bus multiplexer driven by a memory-mapped device 2012-08-30 12:54:48 -04:00
mdio-mux.txt netdev/of/phy: Add MDIO bus multiplexer support. 2012-05-07 22:58:09 -04:00
micrel-ks8851.txt net: micrel : ks8851-ml: add dt support 2013-05-27 23:17:53 -07:00
micrel-ksz9021.txt net/phy: micrel: Add OF configuration support for ksz9021 2013-08-21 00:03:38 -07:00
moxa,moxart-mac.txt net: Add MOXA ART SoCs ethernet driver 2013-08-11 21:38:12 -07:00
phy.txt netdev/phy/of: Handle IEEE802.3 clause 45 Ethernet PHYs in of_mdiobus_register() 2012-06-27 21:23:24 -07:00
smsc-lan91c111.txt arm/versatile: Add device tree support 2011-07-28 01:32:04 -06:00
smsc911x.txt net/smsc911x: add device tree probe support 2011-08-01 18:01:33 -07:00
stmmac.txt driver:net:stmmac: Disable DMA store and forward mode if platform data force_thresh_dma_mode is set. 2013-08-30 17:26:09 -04:00
via-velocity.txt net: velocity: Add platform device support to VIA velocity driver 2013-05-20 13:40:39 -07:00