git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
34a6352
55936cd
)
Linux-omap rebuilt: Updated to v3.6-rc1
author
Tony Lindgren
<tony@atomide.com>
Mon, 6 Aug 2012 09:19:28 +0000
(
02:19
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 6 Aug 2012 09:19:28 +0000
(
02:19
-0700)
$ git checkout -b tmp-rebuild-
1344244756
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-
1344244756
To view the changes since the last rebuild, please do
$ git diff
55936cdfaaf11ac352b56bc58e42d6661e65ee13
..
34a6352791aa55cf404f0754c392514bb7f5b9c1
arch/arm/*omap*/
Trivial merge