leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
356f9e74ff
linux/drivers/net
History
Olof Johansson 356f9e74ff net: stmmac: fix bad merge conflict resolution 
Merge commit 06c54055be did a bad conflict resolution accidentally
leaving out a closing brace.  Add it back.

This breaks a handful of defconfigs on ARM, so it'd be good to see it
applied pretty quickly.

Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-09-05 18:07:00 -07:00
..
appletalk PTR_RET is now PTR_ERR_OR_ZERO(): Replace most. 2013-07-15 11:25:01 +09:30
arcnet arcnet: cleanup sizeof parameter 2013-07-19 17:36:03 -07:00
bonding bonding: drop read_lock in bond_compute_features 2013-09-04 00:27:25 -04:00
caif caif: add a sanity check to the tty name 2013-09-04 00:27:27 -04:00
can can: mscan: improve clock API use 2013-08-29 22:49:35 +02:00
cris
dsa
ethernet net: stmmac: fix bad merge conflict resolution 2013-09-05 18:07:00 -07:00
fddi drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent 2013-08-29 21:55:23 -04:00
hamradio
hippi
hyperv Drivers: hv: remove HV_DRV_VERSION 2013-08-02 11:34:30 +08:00
ieee802154 drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe 2013-07-11 17:18:27 -07:00
irda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-09-05 14:54:29 -07:00
phy net: mdio-octeon: use platform_{get,set}_drvdata() 2013-09-03 22:38:46 -04:00
plip
ppp pptp: fix byte order warnings 2013-08-13 15:10:22 -07:00
slip
team net: team: inherit addr_assign_type along with dev_addr 2013-09-03 20:57:49 -04:00
usb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-09-05 14:54:29 -07:00
vmxnet3 VMXNET3: Add support for virtual IOMMU 2013-08-27 16:02:02 -04:00
wan net: wan: sbni: Fix incorrect placement of __initdata 2013-08-09 13:24:26 -07:00
wimax
wireless Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-09-05 14:54:29 -07:00
xen-netback xen-netback: rename functions 2013-08-29 01:18:04 -04:00
dummy.c
eql.c
ifb.c
Kconfig
LICENSE.SRC
loopback.c
macvlan.c net: macvlan: inherit addr_assign_type along with dev_addr 2013-09-03 20:57:49 -04:00
macvtap.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-08-26 16:37:08 -04:00
Makefile
mdio.c
mii.c
netconsole.c netconsole: avoid a crash with multiple sysfs writers 2013-09-03 22:10:49 -04:00
nlmon.c
ntb_netdev.c
rionet.c
sb1000.c
Space.c
sungem_phy.c
tun.c tuntap: orphan frags before trying to set tx timestamp 2013-09-05 12:44:31 -04:00
veth.c veth: add vlan features 2013-07-19 17:36:03 -07:00
virtio_net.c virtio-net: Set RXCSUM feature if GUEST_CSUM is available 2013-09-03 21:36:41 -04:00
vxlan.c vxlan: Fix kernel panic on device delete. 2013-09-05 14:31:02 -04:00
xen-netfront.c xen-netfront: pull on receive skb may need to happen earlier 2013-07-17 12:51:19 -07:00