From: Olof Johansson <olof@lixom.net>
Date: Thu, 29 Mar 2012 19:25:23 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux... 
X-Git-Tag: firefly_0821_release~3680^2~3178^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a92e7023caf6c3a58b047a4c3fc9e4981b327bb8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of git://git./linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:
"This contains the updated gpio_to_irq patches from Tarun, and a trivial
build fix from Govindraj to #include <asm/system_misc.h> in pm.c.
The DSI mux patch is the same."

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: pm: fix compilation break
  ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
  drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
  ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
  ARM: OMAP2+: Remove __init from DSI mux functions
---

a92e7023caf6c3a58b047a4c3fc9e4981b327bb8