q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/net/can
History
David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2012-09-28 14:40:49 -04:00
..
c_can can: c_can: Adopt pinctrl support 2012-09-21 23:58:48 +02:00
cc770 can: mark bittiming_const pointer in struct can_priv as const 2012-07-20 12:31:05 +02:00
mscan can: mscan-mpc5xxx: fix return value check in mpc512x_can_get_clock() 2012-09-21 23:58:48 +02:00
sja1000 can: sja1000: Add support for listen-only mode and one-shot mode 2012-09-22 15:26:53 -04:00
softing can: softing: Fix potential memory leak in softing_load_fw() 2012-08-24 10:54:05 +02:00
usb can: usb: peak: rename peak_usb dump_mem function 2012-09-21 23:58:48 +02:00
Kconfig can: Kconfig: add more information about Intel EG20T PCH CAN controller 2012-02-03 01:21:26 +01:00
Makefile can: cc770: add driver core for the Bosch CC770 and Intel AN82527 2011-12-01 13:09:31 -05:00
at91_can.c can: mark bittiming_const pointer in struct can_priv as const 2012-07-20 12:31:05 +02:00
bfin_can.c can: mark bittiming_const pointer in struct can_priv as const 2012-07-20 12:31:05 +02:00
dev.c can: dev: fix sparse warning for can_restart 2012-07-02 11:07:25 +02:00
flexcan.c can: flexcan: add 2nd clock to support imx53 and newer 2012-07-20 12:31:05 +02:00
janz-ican3.c can: janz-ican3: fix support for older hardware revisions 2012-09-21 12:54:52 +02:00
mcp251x.c can: mcp251x: avoid repeated frame bug 2012-09-03 20:12:06 +02:00
pch_can.c can: mark bittiming_const pointer in struct can_priv as const 2012-07-20 12:31:05 +02:00
slcan.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ti_hecc.c can: ti_hecc: fix oops during rmmod 2012-09-21 12:54:53 +02:00
vcan.c vcan: add CAN FD support 2012-06-19 21:40:20 +02:00