diff options
| author | David S. Miller | 2013-06-05 02:15:19 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-06-05 02:15:40 +0200 |
| commit | 6f45eba1894a3ece88574079a931cc2e5beee1f3 (patch) | |
| tree | ee60488fafd0ad8c14804562f345d19f598c481b /drivers/net/ethernet/marvell/mvneta.c | |
| parent | net/ethtool: Fix comment regarding location of dev_ethtool() call (diff) | |
| parent | net: can: use platform_{get,set}_drvdata() (diff) | |
| download | kernel-qcow2-linux-6f45eba1894a3ece88574079a931cc2e5beee1f3.tar.gz kernel-qcow2-linux-6f45eba1894a3ece88574079a931cc2e5beee1f3.tar.xz kernel-qcow2-linux-6f45eba1894a3ece88574079a931cc2e5beee1f3.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvneta.c')
0 files changed, 0 insertions, 0 deletions