Merge branch 'master' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Feb 2012 00:24:26 +0000 (19:24 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Feb 2012 00:24:26 +0000 (19:24 -0500)

Trivial merge