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.

diff --cc drivers/net/can/flexcan.c
Simple merge

diff --cc drivers/net/can/pch_can.c
Simple merge

diff --cc drivers/net/can/ti_hecc.c
Simple merge