git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5ee5d4c
1dd8838
)
Linux-omap rebuilt: Merged in initial dt patches
author
Tony Lindgren
<tony@atomide.com>
Tue, 4 Oct 2011 00:02:05 +0000
(17:02 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 4 Oct 2011 00:02:05 +0000
(17:02 -0700)
$ git checkout -b tmp-rebuild-
1317686513
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-
1317686513
To view the changes since the last rebuild, please do
$ git diff
1dd8838c74476fe13e51334ad2444e6c963cf5ff
..
5ee5d4c6fa86b5648fd4f743286ffc26b8561134
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1317686513
Trivial merge