projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc12a22428ae773eff27bad490d35028fe036bf35
tree7ca4b687b6033031b243518e6252700ffcb27340tree | snapshot
parente7abfe40928f4f8c1aa908477c36c13843bd1a57commit | diff
parent391ac1282dd7ff1cb8245cccc5262e8e4173edc4commit | diff
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next

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>
John Crispins staging tree