Merge branch 'can/at91-sam9x5' of git://git.pengutronix.de/git/mkl/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 7 Jun 2011 08:03:56 +0000 (01:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Jun 2011 08:03:56 +0000 (01:03 -0700)

Trivial merge