From: Tony Lindgren <tony@atomide.com>
Date: Mon, 13 Jun 2011 14:47:58 +0000 (-0700)
Subject: Linux-omap rebuilt: Merged PM fixes
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae9b25980183c65381839ed6e547c8137e06fb79;p=pandora-kernel.git

Linux-omap rebuilt: Merged PM fixes

$ git checkout -b tmp-rebuild-1307976465 linus
$ git merge -m "Merge devel-fixes devel-board omap-testing cbus testing-i2c" devel-fixes devel-board omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1307976465

To view the changes since the last rebuild, please do
$ git diff cf855e87009b244fb5cc8e33036329bcb7413c79..f9fbbeff62380dae53004226a73df56d6e982422 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1307976465
---

ae9b25980183c65381839ed6e547c8137e06fb79
Reading git-diff-tree failed