From: Olof Johansson <olof@lixom.net>
Date: Sun, 29 Jan 2012 22:40:19 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux... 
X-Git-Tag: v3.12-rc1~3839^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a81220a61d0cb67880078298485b68da87d8a34;p=kernel%2Fkernel-generic.git

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

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: arch/arm/mach-omap2/smartreflex.c: add missing iounmap
  ARM: OMAP2+: arch/arm/mach-omap2/devices.c: introduce missing kfree
  ARM: OMAP: fix MMC2 loopback clock handling
  ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup
  ARM: OMAP2+: GPMC: fix device size setup
  ARM: OMAP2+: timer: Fix crash due to wrong arg to __omap_dm_timer_read_counter
  ARM: OMAP3: hwmod data: register dss hwmods after dss_core
  ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage
  ARM: OMAP2+: io: fix compilation breakage on 2420-only configs
  ARM: OMAP4: hwmod data: Add names for DMIC memory address space
  ARM: OMAP3: hwmod data: add SYSC_HAS_ENAWAKEUP for dispc
  ARM: OMAP2+: hwmod data: split omap2/3 dispc hwmod class
  ARM: OMAP2: fix regulator warnings
  ARM: OMAP2: fix omap3 touchbook kconfig warning
  i2c: OMAP: Fix OMAP1 build error
---

4a81220a61d0cb67880078298485b68da87d8a34