| commit | b2555b877bf9faf7045ae362ca051590e79167cf | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Jan 22 00:22:12 2013 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Tue Jan 22 00:22:12 2013 -0800 |
| tree | a4dfbc40f93be0c2668bbe51541c8a26f16f44dd | |
| parent | 5046e385b4426e229a6beb4bce480762af91a6fc [diff] | |
| parent | e909c682d04e55e77a3c9d158e7dc36027195493 [diff] |
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes From Sascha Hauer: ARM i.MX fixes for -rc. This contains a single compilation fix for the CODA driver. * tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6: [media] coda: Fix build due to iram.h rename