tree 2d5978467086607efa0e5233c493c77ecffd9ea8
parent fdc0867884ec0fc78091e28efa1d439affb5eb20
parent 3e62af821050668a0c8915121838569ae59359be
author Arnd Bergmann <arnd@arndb.de> 1341601979 +0200
committer Arnd Bergmann <arnd@arndb.de> 1341601979 +0200

Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq

Two bug fixes for the previous state of the imx sparse irq changes.

* 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx: select USE_OF
  ARM: imx: Fix build error due to missing irqs.h include

Signed-off-by: Arnd Bergmann <arnd@arndb.de>