git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5698bd7
44fe47c
)
Linux-omap rebuilt: Updated to v3.6-rc6, merged in updated branches
author
Tony Lindgren
<tony@atomide.com>
Sun, 16 Sep 2012 22:45:28 +0000
(15:45 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Sun, 16 Sep 2012 22:45:28 +0000
(15:45 -0700)
$ git checkout -b tmp-rebuild-
1347835520
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-
1347835520
To view the changes since the last rebuild, please do
$ git diff
168d068029a5f449bd87219ed198cddd13da4753
..
5698bd757d55b1bb87edd1a9744ab09c142abfc2
arch/arm/*omap*/
Trivial merge