David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
ircomm	irda: Fix build failures after IRDA_DEBUG->pr_debug	2014-11-12 22:01:14 -05:00
irlan	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irnet	net: misc: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
Kconfig	[S390] Kconfig: unwanted menus for s390.	2007-05-10 15:46:07 +02:00
Makefile	[IrDA]: Netlink layer.	2007-07-10 22:16:43 -07:00
af_irda.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-14 01:01:12 -05:00
discovery.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irda_device.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
iriap.c	irda: Fix build failures after IRDA_DEBUG->pr_debug	2014-11-12 22:01:14 -05:00
iriap_event.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irias_object.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irlap.c	irda: Fix build failures after IRDA_DEBUG->pr_debug	2014-11-12 22:01:14 -05:00
irlap_event.c	irda: Fix build failures after IRDA_DEBUG->pr_debug	2014-11-12 22:01:14 -05:00
irlap_frame.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irlmp.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irlmp_event.c	irda: Fix build failures after IRDA_DEBUG->pr_debug	2014-11-12 22:01:14 -05:00
irlmp_frame.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irmod.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irnetlink.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irproc.c	irda: irproc: Fix set-but-unused variables.	2011-04-17 16:59:50 -07:00
irqueue.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irsysctl.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
irttp.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
parameters.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
qos.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00
timer.c	treewide: Replace incomming with incoming in all comments and strings	2013-01-03 16:15:49 +01:00
wrapper.c	irda: Convert IRDA_DEBUG to pr_debug	2014-11-12 13:56:41 -05:00