git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
df1a589
06ab5fc
)
Linux-omap rebuilt: Updated to -rc1
author
Tony Lindgren
<tony@atomide.com>
Mon, 4 Jun 2012 10:22:00 +0000
(
03:22
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 4 Jun 2012 10:22:00 +0000
(
03:22
-0700)
$ git checkout -b tmp-rebuild-
1338805305
linus
$ git merge -m "Merge fixes testing-misc tmp-merge testing-board cbus" fixes testing-misc tmp-merge testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1338805305
To view the changes since the last rebuild, please do
$ git diff
06ab5fc430011d3d3f0644f107789190961cd1a6
..
df1a5896b744f6f7afec6b680e93b77e1b19b09f
arch/arm/*omap*/
Trivial merge