]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
authorOlof Johansson <olof@lixom.net>
Tue, 22 Jan 2013 08:22:12 +0000 (00:22 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 22 Jan 2013 08:22:12 +0000 (00:22 -0800)
commit5619c1ac81cdca514536bd58b6fe01a40f6a9ba5
treea4dfbc40f93be0c2668bbe51541c8a26f16f44dd
parent0a3f68683b8fbcffae85bfe87bd344bc22043eaf
parent0eddba4f1bf9a13b51bc02759d3b56ab5f414c5d
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
drivers/media/platform/coda.c