| commit | c12a22428ae773eff27bad490d35028fe036bf35 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Sep 03 21:54:02 2013 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Tue Sep 03 21:54:02 2013 -0400 |
| tree | 7ca4b687b6033031b243518e6252700ffcb27340 | |
| parent | e7abfe40928f4f8c1aa908477c36c13843bd1a57 [diff] | |
| parent | 391ac1282dd7ff1cb8245cccc5262e8e4173edc4 [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>