commit | add794467a20463d7ea50dc9f158a6371d396175 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 17 10:35:31 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 17 10:35:31 2011 -0700 |
tree | 4b8d0e258dfffa96c1440f6ea06a9c8348ef7fa5 | |
parent | 879669961b11e7f40b518784863a259f735a72bf [diff] | |
parent | b8ce9fb8e18af7466e0b915bb5979322cdace322 [diff] |
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