David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-12 13:19:14 -04:00
..
bond_3ad.c	bonding: Changed hashing function to just provide hash	2014-04-24 13:04:34 -04:00
bond_3ad.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-02-19 01:24:22 -05:00
bond_alb.c	bonding: Add tlb_dynamic_lb parameter for tlb mode	2014-04-24 13:04:34 -04:00
bond_alb.h	bonding: Added bond_tlb_xmit() for tlb mode.	2014-04-24 13:04:34 -04:00
bond_debugfs.c	bonding: Convert pr_warning to pr_warn, neatening	2014-02-17 00:29:23 -05:00
bond_main.c	bonding: simplify the slave_do_arp_validate_only()	2014-05-08 23:41:12 -04:00
bond_netlink.c	bonding: force cast of IP address in options	2014-03-11 16:37:14 -04:00
bond_options.c	bonding: make a generic sysfs option store and fix comments	2014-05-09 16:12:51 -04:00
bond_options.h	bonding: make a generic sysfs option store and fix comments	2014-05-09 16:12:51 -04:00
bond_procfs.c	bonding: fix const in options processing	2014-03-06 17:39:19 -05:00
bond_sysfs_slave.c	bonding: change name of sysfs dir for bonding slaves	2014-01-22 21:57:05 -08:00
bond_sysfs.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
bonding.h	bonding: remove the unused macro	2014-05-08 23:41:12 -04:00
Makefile	bonding: add sysfs /slave dir for bond slave devices.	2014-01-17 18:51:58 -08:00