git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2b6168b
7a1794f
)
Linux-omap rebuilt: Updated to -rc7, merged in late branches
author
Tony Lindgren
<tony@atomide.com>
Mon, 24 Sep 2012 02:47:20 +0000
(19:47 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 24 Sep 2012 02:47:20 +0000
(19:47 -0700)
$ git checkout -b tmp-rebuild-
1348454832
linus
$ git merge -m "Merge fixes fixes-noncritical testing-misc tmp-merge testing-board" fixes fixes-noncritical testing-misc tmp-merge testing-board
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1348454832
To view the changes since the last rebuild, please do
$ git diff
7a1794f94ac51c2405d4b0161b97276132256908
..
2b6168ba8c100997f7e5249cfbb6314fa38029d8
arch/arm/*omap*/
Trivial merge