tree 5f55b84771d1b73bcaec534fdbbc1ec6dd21598d
parent 477d4e4fbedafb1cc636124f2de06defceb399b0
parent dfcccd3aaba15e4e8ffae65fb2a757b3e49470de
author Linus Torvalds <torvalds@linux-foundation.org> 1289858771 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289858771 -0800

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  arm: omap1: devices: need to return with a value
  OMAP1: camera.h: add missing include
  omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts
  OMAP2: Devkit8000: Fix mmc regulator failure