From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 20 Mar 2008 15:59:51 +0000 (+0000)
Subject: Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux... 
X-Git-Tag: v2.6.25-rc7~59^2
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=2a1bf8b7da2736d85d683fb921ac9a6b71719f37

Merge branch 'omap-fixes' of /linux/kernel/git/tmlind/linux-omap-2.6 into m

* 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization
  ARM: OMAP: Fix DMA CLINK mask, clear spurious interrupt
  ARM: OMAP: Fix chain_a_transfer return value
  ARM: OMAP: Fix missing makefile options
  ARM: OMAP: Fix GPIO IRQ unmask
  ARM: OMAP: Fix clockevent support for hrtimers
---

2a1bf8b7da2736d85d683fb921ac9a6b71719f37