Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Jul 2012 15:18:45 +0000 (08:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Jul 2012 15:18:45 +0000 (08:18 -0700)

Trivial merge