diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-22 03:22:12 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-22 03:22:12 -0500 |
| commit | b2555b877bf9faf7045ae362ca051590e79167cf (patch) | |
| tree | a4dfbc40f93be0c2668bbe51541c8a26f16f44dd /arch/powerpc/kernel/time.c | |
| 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
Diffstat (limited to 'arch/powerpc/kernel/time.c')
0 files changed, 0 insertions, 0 deletions