Merge branch 'can/at91_can-for-net-2.6' of git://git.pengutronix.de/git/mkl/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Jan 2011 23:16:11 +0000 (15:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jan 2011 23:16:11 +0000 (15:16 -0800)

Trivial merge