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
..
c_can	net: can: c_can_platform: Remove redundant of_match_ptr	2013-10-01 12:30:25 -04:00
cc770	can: cc770: use dev_get_platdata()	2013-09-21 15:43:13 +02:00
mscan	can: Remove extern from function prototypes	2013-09-24 10:09:18 -04:00
sja1000	can: sja1000: remove unnecessary pci_set_drvdata()	2013-09-21 15:43:16 +02:00
softing	Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next	2013-09-30 19:14:20 -04:00
usb	can: pcan_usb_core: fix memory leak on failure paths in peak_usb_start()	2013-09-20 20:58:21 +02:00
at91_can.c	can: at91_can: use dev_get_platdata()	2013-09-21 15:43:13 +02:00
bfin_can.c	can: bfin_can: use dev_get_platdata()	2013-09-21 15:43:13 +02:00
dev.c	can: dev: fix nlmsg size calculation in can_get_size()	2013-10-07 15:55:03 -04:00
flexcan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
grcan.c
janz-ican3.c	can: janz-ican3: use dev_get_platdata()	2013-09-21 15:43:14 +02:00
Kconfig
led.c
Makefile
mcp251x.c	can: mcp251x: use dev_get_platdata()	2013-09-21 15:43:14 +02:00
pch_can.c	can: pch_can: remove unnecessary pci_set_drvdata()	2013-09-21 15:43:16 +02:00
slcan.c	slcan: rewrite of slc_bump and slc_encaps	2013-09-20 15:38:27 -04:00
ti_hecc.c	can: ti_hecc: use dev_get_platdata()	2013-09-21 15:43:15 +02:00
vcan.c