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)
commit5955e7524790a2c8972487ab43347c28a1931521
tree0121e9869e070cdaf9007dacf595be900bce1f4c
parentfd0273c5033630b8673554cd39660435d1ab2ac4
parent3a5655a5b545e9647c3437473ee3d815fe1b9050
Merge branch 'can/at91_can-for-net-2.6' of git://git.pengutronix.de/git/mkl/linux-2.6