Merge branch 'master' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Mon, 4 Jun 2012 15:51:37 +0000 (11:51 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Jun 2012 15:51:37 +0000 (11:51 -0400)

Trivial merge