android_kernel_motorola_sm6225/drivers/net/ethernet/ti
David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-08 23:07:53 -04:00
..
cpmac.c net: cpmac: use dev_get_platdata() 2013-08-30 17:43:38 -04:00
cpsw-phy-sel.c net: ethernet: cpsw-phy-sel: Remove redundant of_match_ptr 2013-10-01 12:30:25 -04:00
cpsw.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-08 23:07:53 -04:00
cpsw.h drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw 2013-09-24 10:33:07 -04:00
cpsw_ale.c drivers: net: cpsw: Add helper functions for VLAN ALE implementation 2013-02-06 15:46:40 -05:00
cpsw_ale.h drivers: net:ethernet: cpsw: add support for VLAN 2013-02-06 15:46:40 -05:00
cpts.c treewide: Fix typos in printk 2013-03-20 16:26:32 +01:00
cpts.h ti: Remove extern from function prototypes 2013-09-24 12:54:10 -07:00
davinci_cpdma.c net: ethernet: davinci_cpdma: export cpdma_chan_get_stats 2013-08-22 20:48:21 -07:00
davinci_cpdma.h net/davinci_cpdma: remove unused argument in cpdma_chan_submit() 2013-04-25 04:11:50 -04:00
davinci_emac.c net:drivers/net: Miscellaneous conversions to ETH_ALEN 2013-10-02 17:04:45 -04:00
davinci_mdio.c net: davinci_mdio: use dev_get_platdata() 2013-08-30 17:43:38 -04:00
Kconfig drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw 2013-09-24 10:33:07 -04:00
Makefile drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw 2013-09-24 10:33:07 -04:00
tlan.c net/trivial: replace numeric with standard PM state macros 2013-06-28 22:11:48 -07:00
tlan.h ThunderLAN: remove is_eisa flag 2013-05-20 00:20:14 -07:00