From: Olof Johansson <olof@lixom.net>
Date: Tue, 18 Sep 2012 02:35:22 +0000 (-0700)
Subject: Merge tag 'cleanup-fixes-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b25c46074a16e261e1fb2baf59578a2ad0cd8ef6;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'cleanup-fixes-for-v3.7' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren:

These fixes are needed to fix non-omap build breakage for
twl-core driver and to fix omap1_defconfig compile when
led driver changes and omap sparse IRQ changes are merged
together. Also fix warnings for omaps not using pinctrl
framework yet.

* tag 'cleanup-fixes-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: Include gpio-omap.h for board-h2 and board-h3
  ARM: OMAP2+: Enable pinctrl dummy states
  mfd: Fix compile for twl-core.c by removing cpu_is_omap usage
---

b25c46074a16e261e1fb2baf59578a2ad0cd8ef6