linux-wandboard

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.