Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 20 Mar 2008 15:59:51 +0000 (15:59 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 20 Mar 2008 15:59:51 +0000 (15:59 +0000)
commit2a1bf8b7da2736d85d683fb921ac9a6b71719f37
tree24149cba37d87b3cf0fb36959be05b957d7d56cc
parenta0d1d04ea810481dd0b8790712086a77bc665b8a
parentc6b349ed8a288f1f69fdd560d509d81351cafd89
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