git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9fbbef cf855e8)
Linux-omap rebuilt: Merged PM fixes
authorTony Lindgren <tony@atomide.com>
Mon, 13 Jun 2011 14:47:58 +0000 (07:47 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 13 Jun 2011 14:47:58 +0000 (07:47 -0700)
$ 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


Trivial merge
Pandora Kernel Repository