]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Wed, 5 Jun 2013 00:15:19 +0000 (17:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Jun 2013 00:15:40 +0000 (17:15 -0700)
commit6a6a790a46af7ab7179fc714cf0087f94a18ddd9
treeee60488fafd0ad8c14804562f345d19f598c481b
parent94decc172fa5242f8211706515c95b5234e42fb2
parent061c4c2903f238115c364b204cec94672ac61204
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 <davem@davemloft.net>