David S. Miller 3cef5c5b0b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/cadence/macb.c Overlapping changes in macb driver, mostly fixes and cleanups in 'net' overlapping with the integration of at91_ether into macb in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-09 23:38:02 -04:00
..
bcmgenet.c	net: bcmgenet: core changes for supporting multiple Rx queues	2015-03-09 22:51:56 -04:00
bcmgenet.h	net: bcmgenet: core changes for supporting multiple Rx queues	2015-03-09 22:51:56 -04:00
bcmgenet_wol.c	net: bcmgenet: properly disable password matching	2015-03-05 21:15:21 -05:00
bcmmii.c	net: bcmgenet: enable driver to work without a device tree	2014-12-08 20:26:59 -05:00
Makefile	net: bcmgenet: add Wake-on-LAN support code	2014-07-21 16:04:31 -07:00