tree 2ee2fdf15e72e450bbfccd9733205b265da0538f
parent 3cdc3acc62527ab9544c2820b5e5da482a105240
parent f750ba9b8db2a926c315ccfa9e95d12fe4590a22
author Olof Johansson <olof@lixom.net> 1321030426 -0800
committer Olof Johansson <olof@lixom.net> 1321030426 -0800

Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes