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)
commitcb2bad862e66eafbc97c26011ab7ab6cedc82810
treeb3c0d31062642421c3d5af17a61b6f89fa3d6816
parenta6b7a407865aab9f849dd99a71072b7cd1175116
parentb9e379bccda6913f7baece42cd249824c0758b97
Merge branch 'can/at91-sam9x5' of git://git.pengutronix.de/git/mkl/linux-2.6