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)

Trivial merge