commit | cf835e8d226481984f72dffc6034fe75e296511e | [log] [tgz] |
---|---|---|
author | Tony Lindgren <tony@atomide.com> | Fri Aug 10 23:21:57 2012 -0700 |
committer | Tony Lindgren <tony@atomide.com> | Fri Aug 10 23:21:57 2012 -0700 |
tree | 4268b2e82c7e8a03c63375bd51f4287fcbf45f15 | |
parent | 90f7f9acecc6dde87cf25db1ad7599926d6773f7 [diff] | |
parent | 196449de0c886e64b48d01bd7ee153656db92884 [diff] |
Merge branch 'for_3.6/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes