From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Jun 2011 17:35:31 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux... 
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~2619
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=add794467a20463d7ea50dc9f158a6371d396175;p=mirror_ubuntu-zesty-kernel.git

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

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP1: PM: register notifiers with generic clock ops even when !PM_RUNTIME
  omap: pandora: fix NAND support
  OMAP: PM: omap_device: fix device power domain callbacks
  OMAP: PM debug: fix section mismatch warnings
---

add794467a20463d7ea50dc9f158a6371d396175