git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7146f1d
c3ed934
)
Linux-omap rebuilt: Updated to -rc9, merge sram map_io changes, please test
author
Tony Lindgren
<tony@atomide.com>
Thu, 6 Oct 2011 02:12:12 +0000
(19:12 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 6 Oct 2011 02:12:12 +0000
(19:12 -0700)
$ git checkout -b tmp-rebuild-
1317867125
linus
$ git merge -m "Merge dt-merge board testing-board" dt-merge board testing-board
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1317867125
To view the changes since the last rebuild, please do
$ git diff
c3ed934ee5c306540e6d0f3e0ce6ed8a8d27c947
..
7146f1d8fc8983bfce945ede61739c0a05e3f5c0
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1317867125
Trivial merge