git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1904e44
5e2564d
)
Linux-omap rebuilt: Merged rebuilt dt-base and dt one more time to avoid duplicate...
author
Tony Lindgren
<tony@atomide.com>
Tue, 4 Oct 2011 21:13:28 +0000
(14:13 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 4 Oct 2011 21:13:28 +0000
(14:13 -0700)
$ git checkout -b tmp-rebuild-
1317762795
linus
$ git merge -m "Merge dt-merge board testing-board cbus" dt-merge board testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1317762795
To view the changes since the last rebuild, please do
$ git diff
5e2564df31555377ee96e718d025d198035143ac
..
1904e448e9c809e5821a8d68cef33d821085ee8d
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1317762795
Trivial merge