Merge branch 'fixes-for-3.12' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Fri, 27 Sep 2013 06:08:03 +0000 (02:08 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Sep 2013 06:08:03 +0000 (02:08 -0400)

Trivial merge