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
..
Kconfig	ptp: fix kconfig dependency warnings	2014-05-12 00:27:26 -04:00
Makefile
ptp_chardev.c	ptp: introduce programmable pins.	2014-03-21 14:21:13 -04:00
ptp_clock.c	ptp: validate the requested frequency adjustment.	2014-04-28 13:28:43 -04:00
ptp_ixp46x.c	ptp: drivers: set the number of programmable pins.	2014-03-21 14:21:14 -04:00
ptp_pch.c	ptp: drivers: set the number of programmable pins.	2014-03-21 14:21:14 -04:00
ptp_private.h	ptp: expose the programmable pins via sysfs	2014-03-21 14:21:14 -04:00
ptp_sysfs.c	ptp: expose the programmable pins via sysfs	2014-03-21 14:21:14 -04:00