Merge branch 'can/mcp251x-for-net-next' of git://git.pengutronix.de/git/mkl/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 18 Oct 2010 14:11:44 +0000 (07:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 18 Oct 2010 14:11:44 +0000 (07:11 -0700)

Trivial merge