Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Mar 2012 21:34:07 +0000 (14:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Mar 2012 21:34:07 +0000 (14:34 -0700)

Trivial merge