Merge branch 'can/mscan' of git://git.pengutronix.de/git/mkl/linux-2.6

This commit is contained in:
David S. Miller 2011-08-17 20:16:00 -07:00
commit f3ba150392