Skip to content
Commit d07d4c23 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next 

Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.
parents dd48dc34 aabdfd6a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment