Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Jun 2012 18:13:26 +0000 (11:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jun 2012 18:13:26 +0000 (11:13 -0700)

Trivial merge