]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7abfe4 391ac12)
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Sep 2013 01:54:02 +0000 (21:54 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Sep 2013 01:54:02 +0000 (21:54 -0400)
Marc Kleine-Budde says:

====================
this is a pull request for net-next. There are two patches from Gerhard
Sittig, which improves the clock handling on mpc5121. Oliver Hartkopp
provides a patch that adds a per rule limitation of frame hops.
====================

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

Trivial merge
Andy's Linux Kernel repo