tree 969df78fbbc76b9ff1289e154b641a06f983569b
parent dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb
parent aabdfd6adb804d0aaba0188ade0f1afe42a52e31
author David S. Miller <davem@davemloft.net> 1328391739 -0500
committer David S. Miller <davem@davemloft.net> 1328391739 -0500

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.