git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
767839f
324974a
)
Linux-omap rebuilt: Rebuilt with updated am33xx data and cleanup-part2
author
Tony Lindgren
<tony@atomide.com>
Fri, 6 Jul 2012 12:11:52 +0000
(
05:11
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 6 Jul 2012 12:11:52 +0000
(
05:11
-0700)
$ git checkout -b tmp-rebuild-
1341576699
linus
$ git merge -m "Merge fixes fixes-non-critical testing-misc tmp-merge testing-board cbus" fixes fixes-non-critical testing-misc tmp-merge testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1341576699
To view the changes since the last rebuild, please do
$ git diff
324974a124328bbbf5f6f275d9dac4e585fface0
..
767839fe8418720e1cd2ee3aeed1aaa84b604c7f
arch/arm/*omap*/
Trivial merge