diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-13 07:24:01 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-13 07:24:01 +0200 |
| commit | cee9f6d0186a586c8023bc91c8a4cf8a088855e5 (patch) | |
| tree | 70847d330cb2c34515f5fa0b7128a2af6b188783 /fs/ceph/super.h | |
| parent | Merge branch 'dsa-of-parsing-fixes' (diff) | |
| parent | can: replace timestamp as unique skb attribute (diff) | |
| download | linux-cee9f6d0186a586c8023bc91c8a4cf8a088855e5.tar.xz linux-cee9f6d0186a586c8023bc91c8a4cf8a088855e5.zip | |
Merge tag 'linux-can-fixes-for-4.2-20150712' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2015-07-12
this is a pull request of 8 patchs for net/master.
Sergei Shtylyov contributes 5 patches for the rcar_can driver, fixing the IRQ
check and several info and error messages. There are two patches by J.D.
Schroeder and Roger Quadros for the c_can driver and dra7x-evm device tree,
which precent a glitch in the DCAN1 pinmux. Oliver Hartkopp provides a better
approach to make the CAN skbs unique, the timestamp is replaced by a counter.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/ceph/super.h')
0 files changed, 0 insertions, 0 deletions