git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0eee34a
f0af726
)
Linux-omap rebuilt: Updated to -rc7, merged in dmtimer
author
Tony Lindgren
<tony@atomide.com>
Thu, 22 Sep 2011 00:48:32 +0000
(17:48 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 22 Sep 2011 00:48:32 +0000
(17:48 -0700)
$ git checkout -b tmp-rebuild-
1316652497
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-
1316652497
To view the changes since the last rebuild, please do
$ git diff
f0af7263b149c5613b4007636525ea86d83e50ca
..
0eee34a1acaaa314aa965eed04da7ff4edbfc755
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1316652497
Trivial merge