From: David S. Miller <davem@davemloft.net>
Date: Sat, 4 Feb 2012 21:42:19 +0000 (-0500)
Subject: Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
X-Git-Tag: v3.4-rc1~177^2~390
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d07d4c239bbf428db5581ccd5ca3770bbd15bfbd;p=pandora-kernel.git

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.
---

d07d4c239bbf428db5581ccd5ca3770bbd15bfbd
Reading git-diff-tree failed