Merge branch 'imx-features-assorted' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/board

This commit is contained in:
Arnd Bergmann 2012-01-03 21:19:19 +00:00
commit ee9ba0f2fd
5 changed files with 16 additions and 2 deletions