Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 Apr 2012 03:47:37 +0000 (23:47 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Apr 2012 03:47:37 +0000 (23:47 -0400)

Trivial merge