diff options
author | David S. Miller <davem@davemloft.net> | 2015-09-21 07:58:23 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-21 07:58:23 +0300 |
commit | eaf9a992b75a0363f15e2d5f40e3ba820098c856 (patch) | |
tree | 667d1fe0e3c63deff7116ccd977d973a1e271914 /Documentation/fault-injection/fault-injection.txt | |
parent | 22a3f9a2043be28cde6d272e786874ba0d6afe15 (diff) | |
parent | 0738eff14d817a02ab082c392c96a1613006f158 (diff) | |
download | linux-eaf9a992b75a0363f15e2d5f40e3ba820098c856.tar.xz |
Merge tag 'linux-can-next-for-4.4-20150917' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2015-09-17
this is a pull request of two patches for net-next/master.
Gerhard Bertelsmann adds support for the CAN controller found on the
Allwinner A10/A20 SoC.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/fault-injection/fault-injection.txt')
0 files changed, 0 insertions, 0 deletions