diff options
author | David S. Miller <davem@davemloft.net> | 2014-01-14 15:29:25 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-14 15:29:25 -0800 |
commit | 08c93cd99b2f31ba9e85ce28ad8946f285b5dc0f (patch) | |
tree | 34aa6a716240b540152f19bc322dcb2b4fd63f67 /drivers/net/ethernet/amd/amd8111e.h | |
parent | 63862b5bef7349dd1137e4c70702c67d77565785 (diff) | |
parent | ea79c1c18520c3a60a2fc8193e2fb58710812d4e (diff) | |
download | blackbird-op-linux-08c93cd99b2f31ba9e85ce28ad8946f285b5dc0f.tar.gz blackbird-op-linux-08c93cd99b2f31ba9e85ce28ad8946f285b5dc0f.zip |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this is a pull request of three patches for net-next/master.
Oleg Moroz added support for a new PCI card to the generic SJA1000 PCI
driver, Guenter Roeck's patch limits the flexcan driver to little
endian arm (and powerpc) and I fixed a sparse warning found by the
kbuild robot in the ti_hecc driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/amd8111e.h')
0 files changed, 0 insertions, 0 deletions