Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Mon, 5 Mar 2012 02:59:39 +0000 (21:59 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 5 Mar 2012 02:59:39 +0000 (21:59 -0500)

Trivial merge