From: David S. Miller Date: Wed, 5 Jun 2013 00:15:19 +0000 (-0700) Subject: Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next X-Git-Tag: upstream/snapshot3+hdmi~4705^2~186 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f45eba1894a3ece88574079a931cc2e5beee1f3;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next Marc Kleine-Budde says: ==================== this is a pull-request for net-next/master. It consists of two patches by Fabio Estevam, cleaning up the flexcan driver (remove default pinctrl and switch to SIMPLE_DEV_PM_OPS). A patch by me to simplify the Kconfig [1] handling for flexcan. And a patch by Jingoo Han that converts the can drivers to use platform_{get,set}_drvdata(). [1] My patch touches arch/{arm,powerpc}, so I collected Acked-bys from Arnd Bergmann, Shawn Guo and Benjamin Herrenschmidt. ==================== Signed-off-by: David S. Miller --- 6f45eba1894a3ece88574079a931cc2e5beee1f3