Merge branch 'for_3.6/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Sat, 11 Aug 2012 06:21:57 +0000 (23:21 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 11 Aug 2012 06:21:57 +0000 (23:21 -0700)
commitcf835e8d226481984f72dffc6034fe75e296511e
tree4268b2e82c7e8a03c63375bd51f4287fcbf45f15
parent90f7f9acecc6dde87cf25db1ad7599926d6773f7
parent196449de0c886e64b48d01bd7ee153656db92884
Merge branch 'for_3.6/fixes/pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into fixes