git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 521cb40 73ee404)
Linux-omap rebuilt: Updated to v2.6.38, merged fixes
authorTony Lindgren <tony@atomide.com>
Fri, 18 Mar 2011 23:54:38 +0000 (16:54 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Mar 2011 23:54:38 +0000 (16:54 -0700)
$ git checkout -b tmp-rebuild-1300492473 linus
$ git merge -m "Merge omap-fixes omap-testing cbus testing-i2c" omap-fixes omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1300492473

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

Merge branch 'master' into tmp-rebuild-1300492473


Trivial merge
Pandora Kernel Repository