git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1b5b06d
0c2838d
)
Linux-omap rebuilt: Merged omap_device and pm-cleanup
author
Tony Lindgren
<tony@atomide.com>
Thu, 22 Sep 2011 23:46:43 +0000
(16:46 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 22 Sep 2011 23:46:43 +0000
(16:46 -0700)
$ git checkout -b tmp-rebuild-
1316735186
linus
$ git merge -m "Merge fixes cleanup voltage dmtimer board testing-misc testing-board cbus" fixes cleanup voltage dmtimer board testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1316735186
To view the changes since the last rebuild, please do
$ git diff
0c2838d00350afc5259730c35bbda81598e8875f
..
1b5b06d766af6ccd547fe059adc7f7d75b4877ee
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1316735186
Trivial merge