From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 6 Mar 2008 12:18:25 +0000 (+0000)
Subject: Merge branch 'omap-fixes'
X-Git-Tag: v2.6.25-rc6~29^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5853e7427858a9ae493ea4999ef1069d2e2550d9;p=linux-2.6

Merge branch 'omap-fixes'

* omap-fixes:
  ARM: OMAP2: Register the L4 io bus to boot OMAP2
  ARM: OMAP1: Compile in other 16xx boards to OSK defconfig
  ARM: OMAP1: Refresh H2 defconfig
  ARM: OMAP1: Refresh OSK defconfig
  ARM: OMAP: gpio lockdep updates
  ARM: OMAP1: omap1/pm.c build fix
  ARM: OMAP1: omap h2 regression fix
  ARM: OMAP1: Fix compile for boards depending on old gpio expander
  ARM: OMAP1: omap h3 regression and build fix
  ARM: OMAP: Remove compiler warning when i2c is not set
  ARM: OMAP: fix omap i2c init (regression)
  ARM: OMAP: fix false lockdep warnings
  ARM: OMAP: Fix sleep under spinlock for cpufreq
  ARM: OMAP: Pass logical DMA channel number always to callback handlers
---

5853e7427858a9ae493ea4999ef1069d2e2550d9