tree 0cb86fd908d91cfc78858e003de9eb43f0508cb0
parent 5e9772b95ba848516b2c76c11cf6f4aa4aa232a5
parent 41bd03ba0758a076671e5de35ed084535984143d
author Linus Torvalds <torvalds@linux-foundation.org> 1277937861 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1277937861 -0700

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:
  OMAP: hwmod: Fix the missing braces
  OMAP4: clock: Fix multi-omap boot with reset un-used clocks
  OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
  omap: GPIO: fix auto-disable of debounce clock
  omap: DMTIMER: Ack pending interrupt always when stopping a timer
  omap: Stalker board: switch over to gpio_set_debounce
  omap: fix build failure due to missing include dma-mapping.h
  omap iommu: Fix Memory leak