Merge branch 'can/mscan' of git://git.pengutronix.de/git/mkl/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 18 Aug 2011 03:16:00 +0000 (20:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Aug 2011 03:16:00 +0000 (20:16 -0700)
commitf3ba150392c85d8175c454a7190b5fa46a49039e
tree4df54351d5d71fddaf416c3ee984382e885c7acb
parentc6865cb3cc6f3c2857fa4c6f5fda2945d70b1e84
parent665d7eb8877c6bb777039efb22f894740be10bcb
Merge branch 'can/mscan' of git://git.pengutronix.de/git/mkl/linux-2.6