]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'ravb-fixes'
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Feb 2016 19:53:00 +0000 (14:53 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Feb 2016 19:53:00 +0000 (14:53 -0500)
commit5d8e498f2e81283a594bd6161f2581a195081765
treebb165a020bee53b22554b602e553d1e1edbeedb7
parentdba36b382e7a3feb5b04849543dc6ec5d522482e
parent50bfd83830b89f9273672dcaedf3b765724fd023
Merge branch 'ravb-fixes'

Sergei Shtylyov says:

====================
ravb: fix the fallout of R-Car gen3 gPTP support

   Here's a set of 2 patches against DaveM's 'net.git' repo fixing up the
incomplete commit f5d7837f96e5 ("ravb: ptp: Add CONFIG mode support").
I'm proposing these as fixes but they can be merged as cleanups as well...

[1/2] ravb: kill duplicate setting of CCC.CSEL
[2/2] ravb: skip gPTP start/stop on R-Car gen3
====================

Signed-off-by: David S. Miller <davem@davemloft.net>