diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-17 01:34:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-17 01:34:11 -0700 |
| commit | c41e4130a248c8220889f6e6636b47595e369386 (patch) | |
| tree | 2514d5bbbf4307971130e7dce9496186a33d39cb /net/ipv6 | |
| parent | 7df2dc6bd4b4b13fd9bd239603cc825e3d1aa316 (diff) | |
| parent | da78b7998e365b3f90b2a1a55d3b6ba6cc0c5905 (diff) | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
the fifth pull request for upcoming v3.6 net-next. The first two
patches (created by me) add const qualifiers to the flexcan and
mpc5xxx_can driver. The next patch by Julia Lawall fixes a return value
problem in the error path of the softing driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
0 files changed, 0 insertions, 0 deletions